let clang use the constant-return error() macro
Commite208f9cconverted error() into a macro to make its constant return value more apparent to calling code. Commit5ded807prevents us using this macro with clang, since clang's -Wunused-value is smart enough to realize that the constant "-1" is useless in some contexts. However, since the last commit puts the constant behind an inline function call, this is enough to prevent the -Wunused-value warning on both modern gcc and clang. So we can now re-enable the macro when compiling with clang. Tested with clang 3.3, 3.4, and 3.5. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
87fe5df365
commit
ff0a80af72
@ -179,7 +179,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__)
|
||||
#define opterror(o,r,f) (opterror((o),(r),(f)), const_error())
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user