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 | |
| parent | d82dd26964b9d7b39fb74367e5fcc3e3f4593324 (diff) | |
| parent | 5ded807f7c0be10ecbb31555e5d10dee553752d6 (diff) | |
| download | git-fa2f83c654f36d666ef7c07e40e0d62a02fbfa06.tar.gz git-fa2f83c654f36d666ef7c07e40e0d62a02fbfa06.tar.xz | |
Merge branch 'jk/suppress-clang-warning'
* jk/suppress-clang-warning:
fix clang -Wunused-value warnings for error functions
| -rw-r--r-- | cache.h | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 2 | ||||
| -rw-r--r-- | parse-options.h | 2 |
3 files changed, 3 insertions, 3 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); diff --git a/git-compat-util.h b/git-compat-util.h index e5a4b7450..dab545e02 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -297,7 +297,7 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))) * behavior. But since we're only trying to help gcc, anyway, it's OK; other * compilers will fall back to using the function as usual. */ -#ifdef __GNUC__ +#if defined(__GNUC__) && ! defined(__clang__) #define error(fmt, ...) (error((fmt), ##__VA_ARGS__), -1) #endif diff --git a/parse-options.h b/parse-options.h index e70385374..1c8bd8d5a 100644 --- a/parse-options.h +++ b/parse-options.h @@ -177,7 +177,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); -#ifdef __GNUC__ +#if defined(__GNUC__) && ! defined(clang) #define opterror(o,r,f) (opterror((o),(r),(f)), -1) #endif |