summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-05-06 15:17:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-06 22:30:40 (GMT)
commitff0a80af724e81dbad6a269847523e39c2e7e479 (patch)
treef2af81cd7cde8d61559dadfbaec8693b47532181 /cache.h
parent87fe5df3653cf20b6bf9854bea42e4016c7d4688 (diff)
downloadgit-ff0a80af724e81dbad6a269847523e39c2e7e479.zip
git-ff0a80af724e81dbad6a269847523e39c2e7e479.tar.gz
git-ff0a80af724e81dbad6a269847523e39c2e7e479.tar.bz2
let clang use the constant-return error() macro
Commit e208f9c converted error() into a macro to make its constant return value more apparent to calling code. Commit 5ded807 prevents 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>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 001b63f..86be95e 100644
--- a/cache.h
+++ b/cache.h
@@ -1183,7 +1183,7 @@ extern int check_repository_format_version(const char *var, const char *value, v
extern int git_env_bool(const char *, int);
extern int git_config_system(void);
extern int config_error_nonbool(const char *);
-#if defined(__GNUC__) && ! defined(__clang__)
+#if defined(__GNUC__)
#define config_error_nonbool(s) (config_error_nonbool(s), const_error())
#endif
extern const char *get_log_output_encoding(void);