summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2009-06-05 23:36:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-06 20:21:05 (GMT)
commit309dbc82e39ea0b402ea06579fd9246df5cf6a01 (patch)
tree6f21527c2ac16a52bb7fd4f8f9ae3db056fe8248
parent70cf991093d4ab8854de0090aca9cf8d10ebd8f8 (diff)
downloadgit-309dbc82e39ea0b402ea06579fd9246df5cf6a01.zip
git-309dbc82e39ea0b402ea06579fd9246df5cf6a01.tar.gz
git-309dbc82e39ea0b402ea06579fd9246df5cf6a01.tar.bz2
On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
OLD_ICONV is only necessary on Solaris until UNIX03. This is indicated by the private macro _XPG6 which is set in /usr/include/sys/feature_tests.h. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile2
-rw-r--r--utf8.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d36e92c..d8f9c22 100644
--- a/Makefile
+++ b/Makefile
@@ -705,7 +705,7 @@ ifeq ($(uname_S),SunOS)
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
NO_MKDTEMP = YesPlease
- OLD_ICONV = UnfortunatelyYes
+ NO_MKSTEMPS = YesPlease
ifeq ($(uname_R),5.8)
NO_UNSETENV = YesPlease
NO_SETENV = YesPlease
diff --git a/utf8.c b/utf8.c
index ddfdc5e..db706ac 100644
--- a/utf8.c
+++ b/utf8.c
@@ -354,7 +354,7 @@ int is_encoding_utf8(const char *name)
* with iconv. If the conversion fails, returns NULL.
*/
#ifndef NO_ICONV
-#ifdef OLD_ICONV
+#if defined(OLD_ICONV) || (defined(__sun__) && !defined(_XPG6))
typedef const char * iconv_ibp;
#else
typedef char * iconv_ibp;