Merge branch 'jk/tighten-alloc' into maint

diff --git a/parse-options.h b/parse-options.h
index ea4af92a5110554c450665e08fce3a97310e5640..78f8384c56b02cbabcc586b3ee082cb1cb12e764 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -215,7 +215,7 @@ extern int parse_options_step(struct parse_opt_ctx_t *ctx,
 
 extern int parse_options_end(struct parse_opt_ctx_t *ctx);
 
-extern int parse_options_concat(struct option *dst, size_t, struct option *src);
+extern struct option *parse_options_concat(struct option *a, struct option *b);
 
 /*----- some often used options -----*/
 extern int parse_opt_abbrev_cb(const struct option *, const char *, int);