Subject: [PATCH] wcwidth redeclaration

From: [email-masked] (Amos Waterland)
Date: Tue, 8 May 2007 00:46:08 -0400

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

Here is a patch that fixes it for me.  If there is a different way that
is preferred, please let me know.

Signed-off-by: Amos Waterland <[email-masked]>

---

 utf8.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- utf8.c.orig	Tue May  8 00:40:18 2007
+++ utf8.c	Tue May  8 00:45:00 2007
@@ -62,7 +62,7 @@
  * 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 @@
 		return 0;
 	}
 
-	return wcwidth(ch);
+	return git_wcwidth(ch);
 }
 
 int is_utf8(const char *text)