Merge branch 'jk/suppress-clang-warning'

* jk/suppress-clang-warning:
fix clang -Wunused-value warnings for error functions

diff --git a/cache.h b/cache.h
index 4022b5ba0a5faca2b3d9d45741fc8ab74bd84267..1f96f659e484fd1407dbc403c4095205cf3b0c54 100644 (file)
--- 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);

diff --git a/git-compat-util.h b/git-compat-util.h
index e5a4b7450bfa7a700ce1c76f597266a9724a19f5..dab545e02e17b834da63d911615bd2afa04a702c 100644 (file)
--- 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 e703853749f0949c58cde0a27ff1d01991609400..1c8bd8d5a0894d9deda1e849165ff38e8d594a4d 100644 (file)
--- 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