Merge branch 'maint'

* maint: parse-options: fix clang opterror() -Wunused-value warning
git · Aug 9, 2013 · 96cb27a · 96cb27a
2 parents b48493e + a3bc3d0
commit 96cb27a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/parse-options.h b/parse-options.h
@@ -180,7 +180,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);
-#if defined(__GNUC__) && ! defined(clang)
+#if defined(__GNUC__) && ! defined(__clang__)
 #define opterror(o,r,f) (opterror((o),(r),(f)), -1)
 #endif