summaryrefslogtreecommitdiff
path: root/utf8.c
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2009-06-05 18:36:12 -0500
committerJunio C Hamano <gitster@pobox.com>2009-06-06 13:21:05 -0700
commit309dbc82e39ea0b402ea06579fd9246df5cf6a01 (patch)
tree6f21527c2ac16a52bb7fd4f8f9ae3db056fe8248 /utf8.c
parent70cf991093d4ab8854de0090aca9cf8d10ebd8f8 (diff)
downloadgit-309dbc82e39ea0b402ea06579fd9246df5cf6a01.tar.gz
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>
Diffstat (limited to 'utf8.c')
-rw-r--r--utf8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utf8.c b/utf8.c
index ddfdc5e2b8..db706ac4ed 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;