Merge branch 'zk/clean-report-failure'

diff --git a/parse-options.h b/parse-options.h
index 71a39c60d942601a1cf30e218df56777742d5580..e703853749f0949c58cde0a27ff1d01991609400 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -177,6 +177,10 @@ 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__
+#define opterror(o,r,f) (opterror((o),(r),(f)), -1)
+#endif
+
 /*----- incremental advanced APIs -----*/
 
 enum {