undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec

Browse Source 
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>
This commit is contained in:
Brandon Casey 2009-06-05 18:36:12 -05:00 committed by Junio C Hamano
parent 70cf991093
commit 309dbc82e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -705,7 +705,7 @@ ifeq ($(uname_S),SunOS)
NO_STRCASESTR = YesPlease NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
NO_MKDTEMP = YesPlease NO_MKDTEMP = YesPlease
OLD_ICONV = UnfortunatelyYes NO_MKSTEMPS = YesPlease
ifeq ($(uname_R),5.8) ifeq ($(uname_R),5.8)
NO_UNSETENV = YesPlease NO_UNSETENV = YesPlease
NO_SETENV = YesPlease NO_SETENV = YesPlease

2
utf8.c
View File

@ -354,7 +354,7 @@ int is_encoding_utf8(const char *name)
* with iconv. If the conversion fails, returns NULL. * with iconv. If the conversion fails, returns NULL.
*/ */
#ifndef NO_ICONV #ifndef NO_ICONV
#ifdef OLD_ICONV #if defined(OLD_ICONV) || (defined(__sun__) && !defined(_XPG6))
typedef const char * iconv_ibp; typedef const char * iconv_ibp;
#else #else
typedef char * iconv_ibp; typedef char * iconv_ibp;