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>
Amos Waterland committed
May 8, 2007 at 00:46 UTC
b51be13c9c83621551824876ee037151a92f0323
1 file changed
+2
-2
utf8.c
+2
-2
@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) {
62
* in ISO 10646.
63
*/
64
65
-static int wcwidth(ucs_char_t ch)
65
+static int git_wcwidth(ucs_char_t ch)
66
{
67
/*
68
* Sorted list of non-overlapping intervals of non-spacing characters,
@@ -207,7 +207,7 @@ invalid:
207
return 0;
208
}
209
210
- return wcwidth(ch);
210
+ return git_wcwidth(ch);
211
}
212
213
int is_utf8(const char *text)