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

diff --git a/Makefile b/Makefile
index ade79232f4c3c080fa7d35c4b55870c416e49da6..5c2b797554a25d5cecee28aa6d18fc885aa0b3e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 9c23622ed5ee9b60d40921ae74dd1149e1d68b8c..bf947b1ec361aafeef58d43ef8eae979699b35ac 100644 (file)
--- 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)