summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-23 21:19:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-23 21:19:00 -0800
commitfa2f83c654f36d666ef7c07e40e0d62a02fbfa06 (patch)
treef981d03f16b567c8fe6f9ef76727275390d8d89a /cache.h
parentMerge branch 'cr/push-force-tag-update' (diff)
parentfix clang -Wunused-value warnings for error functions (diff)
downloadtgif-fa2f83c654f36d666ef7c07e40e0d62a02fbfa06.tar.xz
Merge branch 'jk/suppress-clang-warning'
* jk/suppress-clang-warning: fix clang -Wunused-value warnings for error functions
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 4022b5ba0a..1f96f659e4 100644
--- a/cache.h
+++ b/cache.h
@@ -1147,7 +1147,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 *);
-#ifdef __GNUC__
+#if defined(__GNUC__) && ! defined(__clang__)
#define config_error_nonbool(s) (config_error_nonbool(s), -1)
#endif
extern const char *get_log_output_encoding(void);