diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:17:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:17:47 -0700 |
| commit | 3b3b61c5d5ef93a68e9af3c17eebc09c96b71d08 (patch) | |
| tree | 679fdf05b61712bac8ff89f717a6cbdcb2d7e624 /git-compat-util.h | |
| parent | dadb89d92ce9c81846c1b4c743a41b6e845b572c (diff) | |
| parent | 066dd2632acf11a348ff209b79f42c1a87a71fbb (diff) | |
| download | git-3b3b61c5d5ef93a68e9af3c17eebc09c96b71d08.tar.gz | |
Merge branch 'ak/profile-feedback-build'
* ak/profile-feedback-build:
Fix profile feedback with -jN and add profile-fast
Run the perf test suite for profile feedback too
Don't define away __attribute__ on gcc
Use BASIC_FLAGS for profile feedback
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 0b53c9a4af..63d72db553 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -291,10 +291,12 @@ extern char *gitbasename(char *); #else #define NORETURN #define NORETURN_PTR +#ifndef __GNUC__ #ifndef __attribute__ #define __attribute__(x) #endif #endif +#endif /* The sentinel attribute is valid from gcc version 4.0 */ #if defined(__GNUC__) && (__GNUC__ >= 4) |