1. Stefan Saasen
  2. git


Amos Waterland  committed b51be13

wcwidth redeclaration

Build fails for git 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>

Comments (0)

Files changed (1)

File utf8.c Modified

View file
  • Ignore whitespace
  • Hide word diff
  * 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,
 		return 0;
-	return wcwidth(ch);
+	return git_wcwidth(ch);
 int is_utf8(const char *text)