From: Michal Rokos Date: Mon, 7 Mar 2011 12:13:15 +0000 (+0100) Subject: git-compat-util.h: Honor HP C's noreturn attribute X-Git-Tag: v1.7.4.2~6^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b6ab349b184b3a33c7bcc03521dafed3f9df380a;p=git.git git-compat-util.h: Honor HP C's noreturn attribute HP C for Integrity servers (Itanium) gained support for noreturn attribute sometime in 2006. It was released in Compiler Version A.06.10 and made available in July 2006. The __HP_cc define detects the HP C compiler version. Precede the __GNUC__ check so it works well when compiling with HP C using -Agcc option that enables partial support for the GNU C dialect. The -Agcc defines the __GNUC__ too. Signed-off-by: Michal Rokos Signed-off-by: Junio C Hamano --- diff --git a/git-compat-util.h b/git-compat-util.h index d6d269f13..e2d7e5017 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -208,7 +208,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)