From b51be13c9c83621551824876ee037151a92f0323 Mon Sep 17 00:00:00 2001 From: Amos Waterland Date: Tue, 8 May 2007 00:46:08 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- utf8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utf8.c b/utf8.c index a2965c9c11..4efef6faf7 100644 --- a/utf8.c +++ b/utf8.c @@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) { * 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, @@ -207,7 +207,7 @@ invalid: return 0; } - return wcwidth(ch); + return git_wcwidth(ch); } int is_utf8(const char *text) -- cgit v1.2.3