Skip to content

Commit

Permalink
Merge branch 'mr/hpux' into maint
Browse files Browse the repository at this point in the history
* mr/hpux:
  git-compat-util.h: Honor HP C's noreturn attribute
  Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
  • Loading branch information
Junio C Hamano committed Mar 21, 2011
2 parents 106040f + b6ab349 commit dd7d0d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion git-compat-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit dd7d0d0

Please sign in to comment.