diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-20 22:11:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 22:11:15 -0700 |
| commit | dd7d0d09765117700db87b4ecf63551dd56a267a (patch) | |
| tree | d7ee57d08d0a2855b28b882fd15e0b5e539cc59d | |
| parent | 106040fe8ecb670261f423c285d494d6d0170558 (diff) | |
| parent | b6ab349b184b3a33c7bcc03521dafed3f9df380a (diff) | |
| download | git-dd7d0d09765117700db87b4ecf63551dd56a267a.tar.gz | |
Merge branch 'mr/hpux' into maint
* mr/hpux:
git-compat-util.h: Honor HP C's noreturn attribute
Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | git-compat-util.h | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -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) diff --git a/git-compat-util.h b/git-compat-util.h index 9c23622ed5..bf947b1ec3 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -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) |