Skip to content

Commit dd7d0d0

Browse files
committed
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
2 parents 106040f + b6ab349 commit dd7d0d0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,7 @@ ifeq ($(uname_S),HP-UX)
10421042
NO_UNSETENV = YesPlease
10431043
NO_HSTRERROR = YesPlease
10441044
NO_SYS_SELECT_H = YesPlease
1045+
NO_FNMATCH_CASEFOLD = YesPlease
10451046
SNPRINTF_RETURNS_BOGUS = YesPlease
10461047
NO_NSEC = YesPlease
10471048
ifeq ($(uname_R),B.11.00)

git-compat-util.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,10 @@ extern char *gitbasename(char *);
214214
#define is_dir_sep(c) ((c) == '/')
215215
#endif
216216

217-
#ifdef __GNUC__
217+
#if __HP_cc >= 61000
218+
#define NORETURN __attribute__((noreturn))
219+
#define NORETURN_PTR
220+
#elif defined(__GNUC__)
218221
#define NORETURN __attribute__((__noreturn__))
219222
#define NORETURN_PTR __attribute__((__noreturn__))
220223
#elif defined(_MSC_VER)

0 commit comments

Comments
 (0)