提交 b51be13c 编写于 作者: A Amos Waterland 提交者: Junio C Hamano

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: NAmos Waterland <apw@us.ibm.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 52c80037
...@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) { ...@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) {
* in ISO 10646. * 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, * Sorted list of non-overlapping intervals of non-spacing characters,
...@@ -207,7 +207,7 @@ int utf8_width(const char **start) ...@@ -207,7 +207,7 @@ int utf8_width(const char **start)
return 0; return 0;
} }
return wcwidth(ch); return git_wcwidth(ch);
} }
int is_utf8(const char *text) int is_utf8(const char *text)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册