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

Merge branch 'jc/solaris-0811'

Browse Source 
* jc/solaris-0811:
  OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
  Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
This commit is contained in:
Junio C Hamano 2009-05-31 16:18:02 -07:00
commit 714cdcd03e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -702,7 +702,9 @@ ifeq ($(uname_S),SunOS)
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
NO_HSTRERROR = YesPlease NO_HSTRERROR = YesPlease
NO_MKDTEMP = YesPlease NO_MKDTEMP = YesPlease
OLD_ICONV = UnfortunatelyYes ifneq ($(uname_R),5.11)
OLD_ICONV = UnfortunatelyYes
endif
ifeq ($(uname_R),5.8) ifeq ($(uname_R),5.8)
NO_UNSETENV = YesPlease NO_UNSETENV = YesPlease
NO_SETENV = YesPlease NO_SETENV = YesPlease

2
git-compat-util.h
View File

@ -41,8 +41,10 @@
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && !defined(_M_UNIX) #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && !defined(_M_UNIX)
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */ #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
#ifndef __sun__
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */ #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#endif #endif
#endif
#define _ALL_SOURCE 1 #define _ALL_SOURCE 1
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#define _BSD_SOURCE 1 #define _BSD_SOURCE 1