diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:21:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:21:36 -0700 |
| commit | 610a14f643b1dfe188e938492425cc88d96025a8 (patch) | |
| tree | 419bdf6d93f09a4f3551652be0686ba609870f54 /parse-options.h | |
| parent | d2a274aa87d69786aa95da2f2eab88aa6b77644f (diff) | |
| parent | ff0a80af724e81dbad6a269847523e39c2e7e479 (diff) | |
| download | git-610a14f643b1dfe188e938492425cc88d96025a8.tar.gz | |
Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'
* jk/squelch-compiler-warning-from-funny-error-macro:
let clang use the constant-return error() macro
inline constant return from error() function
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parse-options.h b/parse-options.h index 3189676695..7940bc71af 100644 --- a/parse-options.h +++ b/parse-options.h @@ -176,8 +176,8 @@ 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__) -#define opterror(o,r,f) (opterror((o),(r),(f)), -1) +#if defined(__GNUC__) +#define opterror(o,r,f) (opterror((o),(r),(f)), const_error()) #endif /*----- incremental advanced APIs -----*/ |