diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-09 21:19:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-09 21:19:06 (GMT) |
| commit | 84c99b20231e77fe1df7ea487e3dc24359cba028 (patch) | |
| tree | 6dcda47c0134a8e5bc468e61bf0ee41263198482 /parse-options.h | |
| parent | 92dd0a55d0f8b5c8a35425309006a4b982a4d69e (diff) | |
| parent | 06a199f38b50ccea198c29216c69bb389ca23391 (diff) | |
| download | git-84c99b20231e77fe1df7ea487e3dc24359cba028.zip git-84c99b20231e77fe1df7ea487e3dc24359cba028.tar.gz git-84c99b20231e77fe1df7ea487e3dc24359cba028.tar.bz2 | |
Merge branch 'ab/parse-options-cleanup'
Last minute fix to the update already in 'master'.
* ab/parse-options-cleanup:
parse-options.[ch]: revert use of "enum" for parse_options()
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/parse-options.h b/parse-options.h index bdea052..275fb44 100644 --- a/parse-options.h +++ b/parse-options.h @@ -213,11 +213,10 @@ struct option { * untouched and parse_options() returns the number of options * processed. */ -enum parse_opt_result parse_options(int argc, const char **argv, - const char *prefix, - const struct option *options, - const char * const usagestr[], - enum parse_opt_flags flags); +int parse_options(int argc, const char **argv, const char *prefix, + const struct option *options, + const char * const usagestr[], + enum parse_opt_flags flags); NORETURN void usage_with_options(const char * const *usagestr, const struct option *options); |