diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:19:00 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:19:00 -0800 |
commit | fa2f83c654f36d666ef7c07e40e0d62a02fbfa06 (patch) | |
tree | f981d03f16b567c8fe6f9ef76727275390d8d89a /cache.h | |
parent | Merge branch 'cr/push-force-tag-update' (diff) | |
parent | fix clang -Wunused-value warnings for error functions (diff) | |
download | tgif-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.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |