diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-09 15:49:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-09 15:49:55 -0700 |
| commit | 96cb27a9d2db3c01b8e296a0fbc1da1da09d1412 (patch) | |
| tree | bd1025351e85a9d5f2d7776ada9404051d657475 /parse-options.h | |
| parent | b48493e937bb46d352336e2918e37120fe1d352d (diff) | |
| parent | a3bc3d070cacf07dbe11b4bfec57554c8bbf1957 (diff) | |
| download | git-96cb27a9d2db3c01b8e296a0fbc1da1da09d1412.tar.gz | |
Merge branch 'maint'
* maint:
parse-options: fix clang opterror() -Wunused-value warning
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parse-options.h b/parse-options.h index c378b75b13..9b94596e4a 100644 --- a/parse-options.h +++ b/parse-options.h @@ -180,7 +180,7 @@ extern NORETURN void usage_msg_opt(const char *msg, extern int optbug(const struct option *opt, const char *reason); extern int opterror(const struct option *opt, const char *reason, int flags); -#if defined(__GNUC__) && ! defined(clang) +#if defined(__GNUC__) && ! defined(__clang__) #define opterror(o,r,f) (opterror((o),(r),(f)), -1) #endif |