Merge branch 'jc/parseopt-command-modes'

diff --git a/parse-options.h b/parse-options.h
index 2404e06732366dd325c2f32c0453c3bdee8590dc..f37fc88143f0cc0277b33d55ec92cc43034774cf 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -183,7 +183,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