Merge branch 'maint'

* maint:
parse-options: fix clang opterror() -Wunused-value warning

diff --git a/parse-options.h b/parse-options.h
index c378b75b13317d27f05232c7a035ddad2374a87e..9b94596e4aa113518d502502a0ca1bf804a60cbc 100644 (file)
--- 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