diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:32:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:32:52 -0700 |
| commit | d37b2991b1edea76c01ec05cc383005b55c96e36 (patch) | |
| tree | 84981b73f1de1fb6ff924059da0c1d77e3d6ccdd /git-compat-util.h | |
| parent | 55272570dbe1c3f2a6f2f142c4bfe806665cd111 (diff) | |
| parent | 39001007390a699265f16da47474d2b112118931 (diff) | |
| download | git-d37b2991b1edea76c01ec05cc383005b55c96e36.tar.gz | |
Merge branch 'ak/gcc46-profile-feedback'
* ak/gcc46-profile-feedback:
Add explanation of the profile feedback build to the README
Add profile feedback build to git
Add option to disable NORETURN
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index a75530df7b..ddfbf77149 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -222,7 +222,7 @@ extern char *gitbasename(char *); #if __HP_cc >= 61000 #define NORETURN __attribute__((noreturn)) #define NORETURN_PTR -#elif defined(__GNUC__) +#elif defined(__GNUC__) && !defined(NO_NORETURN) #define NORETURN __attribute__((__noreturn__)) #define NORETURN_PTR __attribute__((__noreturn__)) #elif defined(_MSC_VER) |