Merge branch 'maint'

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

Merge branch 'maint'
* maint: parse-options: fix clang opterror() -Wunused-value warning
96cb27a9 · Junio C Hamano · b48493e9 · a3bc3d07 · 96cb27a9
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

parse-options.h parse-options.h +1 -1

未找到文件。
--- 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