Browse Source

Merge branch 'mr/hpux'

* mr/hpux:
  git-compat-util.h: Honor HP C's noreturn attribute
  Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
maint
Junio C Hamano 14 years ago
parent
commit
848e219fe6
  1. 1
      Makefile
  2. 5
      git-compat-util.h

1
Makefile

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

5
git-compat-util.h

@ -214,7 +214,10 @@ extern char *gitbasename(char *); @@ -214,7 +214,10 @@ extern char *gitbasename(char *);
#define is_dir_sep(c) ((c) == '/')
#endif

#ifdef __GNUC__
#if __HP_cc >= 61000
#define NORETURN __attribute__((noreturn))
#define NORETURN_PTR
#elif defined(__GNUC__)
#define NORETURN __attribute__((__noreturn__))
#define NORETURN_PTR __attribute__((__noreturn__))
#elif defined(_MSC_VER)

Loading…
Cancel
Save