summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 11:21:36 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 11:21:36 -0700
commit610a14f643b1dfe188e938492425cc88d96025a8 (patch)
tree419bdf6d93f09a4f3551652be0686ba609870f54 /cache.h
parentd2a274aa87d69786aa95da2f2eab88aa6b77644f (diff)
parentff0a80af724e81dbad6a269847523e39c2e7e479 (diff)
downloadgit-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 'cache.h')
-rw-r--r--cache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 62a4d39efc..8c6cdc29de 100644
--- a/cache.h
+++ b/cache.h
@@ -1294,8 +1294,8 @@ 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__)
-#define config_error_nonbool(s) (config_error_nonbool(s), -1)
+#if defined(__GNUC__)
+#define config_error_nonbool(s) (config_error_nonbool(s), const_error())
#endif
extern const char *get_log_output_encoding(void);
extern const char *get_commit_output_encoding(void);