kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

wcwidth redeclaration 

Build fails for git 1.5.1.3 on AIX, with the message:

utf8.c:66: error: conflicting types for 'wcwidth'
/.../lib/gcc/powerpc-ibm-aix5.3.0.0/4.0.3/include/string.h:266: error: previous declaration of 'wcwidth' was here

Fix this by renaming our static variant to our own name.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Amos Waterland 2007-05-08 00:46:08 -04:00 committed by Junio C Hamano
parent 52c80037e4
commit b51be13c9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utf8.c
View File

@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) {
* in ISO 10646. * in ISO 10646.
*/ */


static int wcwidth(ucs_char_t ch) static int git_wcwidth(ucs_char_t ch)
{ {
/* /*
* Sorted list of non-overlapping intervals of non-spacing characters, * Sorted list of non-overlapping intervals of non-spacing characters,
@ -207,7 +207,7 @@ invalid:
return 0; return 0;
} }


return wcwidth(ch); return git_wcwidth(ch);
} }


int is_utf8(const char *text) int is_utf8(const char *text)