From: apw@us•ibm.com (Amos Waterland)
To: git@vger•kernel.org
Subject: [PATCH] wcwidth redeclaration
Date: Tue, 8 May 2007 00:46:08 -0400 [thread overview]
Message-ID: <20070508044608.GA32223@us.ibm.com> (raw)
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 <apw@us•ibm.com>
---
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)
next reply other threads:[~2007-05-08 4:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-08 4:46 Amos Waterland [this message]
2007-05-08 5:02 ` [PATCH] wcwidth redeclaration Junio C Hamano
2007-05-08 10:03 ` Johannes Schindelin
2007-05-08 17:18 ` Amos Waterland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070508044608.GA32223@us.ibm.com \
--to=apw@us$(echo .)ibm.com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox