From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2011 05:11:15 +0000 (-0700)
Subject: Merge branch 'mr/hpux' into maint
X-Git-Tag: v1.7.4.2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dd7d0d09765117700db87b4ecf63551dd56a267a?hp=106040fe8ecb670261f423c285d494d6d0170558

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 ade79232f4..5c2b797554 100644
--- 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 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)