diff options
| author | Amos Waterland <apw@us.ibm.com> | 2007-05-08 00:46:08 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-07 22:02:40 -0700 |
| commit | b51be13c9c83621551824876ee037151a92f0323 (patch) | |
| tree | f6e7e1465a416eb2c1af3257964f081bb3cafaff /utf8.c | |
| parent | 52c80037e423c7e7806cf2f198ed978dc36fa654 (diff) | |
| download | git-b51be13c9c83621551824876ee037151a92f0323.tar.gz | |
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>
Diffstat (limited to 'utf8.c')
| -rw-r--r-- | utf8.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |