summaryrefslogtreecommitdiff
path: root/parse-options.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-23 21:19:00 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-23 21:19:00 -0800
commitfa2f83c654f36d666ef7c07e40e0d62a02fbfa06 (patch)
treef981d03f16b567c8fe6f9ef76727275390d8d89a /parse-options.h
parentd82dd26964b9d7b39fb74367e5fcc3e3f4593324 (diff)
parent5ded807f7c0be10ecbb31555e5d10dee553752d6 (diff)
Merge branch 'jk/suppress-clang-warning'
* jk/suppress-clang-warning: fix clang -Wunused-value warnings for error functions
Diffstat (limited to 'parse-options.h')
-rw-r--r--parse-options.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/parse-options.h b/parse-options.h
index e703853749..1c8bd8d5a0 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