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

Merge branch 'mr/hpux' into maint

Browse Source 
* mr/hpux:
  git-compat-util.h: Honor HP C's noreturn attribute
  Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
This commit is contained in:
Junio C Hamano 2011-03-20 22:11:15 -07:00
commit dd7d0d0976
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -1042,6 +1042,7 @@ ifeq ($(uname_S),HP-UX)
NO_UNSETENV = YesPlease NO_UNSETENV = YesPlease
NO_HSTRERROR = YesPlease NO_HSTRERROR = YesPlease
NO_SYS_SELECT_H = YesPlease NO_SYS_SELECT_H = YesPlease
NO_FNMATCH_CASEFOLD = YesPlease
SNPRINTF_RETURNS_BOGUS = YesPlease SNPRINTF_RETURNS_BOGUS = YesPlease
NO_NSEC = YesPlease NO_NSEC = YesPlease
ifeq ($(uname_R),B.11.00) ifeq ($(uname_R),B.11.00)

5
git-compat-util.h
View File

@ -214,7 +214,10 @@ extern char *gitbasename(char *);
#define is_dir_sep(c) ((c) == '/') #define is_dir_sep(c) ((c) == '/')
#endif #endif
#ifdef __GNUC__ #if __HP_cc >= 61000
#define NORETURN __attribute__((noreturn))
#define NORETURN_PTR
#elif defined(__GNUC__)
#define NORETURN __attribute__((__noreturn__)) #define NORETURN __attribute__((__noreturn__))
#define NORETURN_PTR __attribute__((__noreturn__)) #define NORETURN_PTR __attribute__((__noreturn__))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)