wcwidth redeclaration

Amos Waterland · Junio C Hamano · commit b51be13c9c83 · 2007-05-07T22:02:40.000-07:00
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 &lt;apw@us.ibm.com&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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 @@ int utf8_width(const char **start)
 		return 0;
 	}
 
-	return wcwidth(ch);
+	return git_wcwidth(ch);
 }
 
 int is_utf8(const char *text)

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) {`
`62`	`62`	`* in ISO 10646.`
`63`	`63`	`*/`
`64`	`64`
`65`		`-static int wcwidth(ucs_char_t ch)`
	`65`	`+static int git_wcwidth(ucs_char_t ch)`
`66`	`66`	`{`
`67`	`67`	`/*`
`68`	`68`	`* Sorted list of non-overlapping intervals of non-spacing characters,`
`@@ -207,7 +207,7 @@ int utf8_width(const char **start)`
`207`	`207`	`return 0;`
`208`	`208`	`}`
`209`	`209`
`210`		`- return wcwidth(ch);`
	`210`	`+ return git_wcwidth(ch);`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`int is_utf8(const char *text)`