summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2019-08-20 18:49:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-20 19:37:30 (GMT)
commit19800bdc3f35fd0d0ab1bcef4dfa9ac69968288f (patch)
tree57761cddc9b16daa5bdc7d764670ff824c2bccd9
parentf7e68a08780e91d7c2f830f33457041407172b96 (diff)
downloadgit-19800bdc3f35fd0d0ab1bcef4dfa9ac69968288f.zip
git-19800bdc3f35fd0d0ab1bcef4dfa9ac69968288f.tar.gz
git-19800bdc3f35fd0d0ab1bcef4dfa9ac69968288f.tar.bz2
parseopt: move definition of enum parse_opt_result up
Define enum parse_opt_result before using it in a typedef. This avoids the following compiler warning: ./parse-options.h:53:14: error: ISO C forbids forward references to 'enum' types [-Werror,-Wpedantic] typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx, ^ While GCC and Clang both accept such a forward reference by default, other compilers might be less forgiving. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--parse-options.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/parse-options.h b/parse-options.h
index 7d83e29..c4713a0 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -45,6 +45,15 @@ enum parse_opt_option_flags {
PARSE_OPT_COMP_ARG = 1024
};
+enum parse_opt_result {
+ PARSE_OPT_COMPLETE = -3,
+ PARSE_OPT_HELP = -2,
+ PARSE_OPT_ERROR = -1, /* must be the same as error() */
+ PARSE_OPT_DONE = 0, /* fixed so that "return 0" works */
+ PARSE_OPT_NON_OPTION,
+ PARSE_OPT_UNKNOWN
+};
+
struct option;
typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
@@ -224,15 +233,6 @@ const char *optname(const struct option *opt, int flags);
/*----- incremental advanced APIs -----*/
-enum parse_opt_result {
- PARSE_OPT_COMPLETE = -3,
- PARSE_OPT_HELP = -2,
- PARSE_OPT_ERROR = -1, /* must be the same as error() */
- PARSE_OPT_DONE = 0, /* fixed so that "return 0" works */
- PARSE_OPT_NON_OPTION,
- PARSE_OPT_UNKNOWN
-};
-
/*
* It's okay for the caller to consume argv/argc in the usual way.
* Other fields of that structure are private to parse-options and should not