about summary refs log tree commit diff
path: root/argp
diff options
context:
space:
mode:
Diffstat (limited to 'argp')
-rw-r--r--argp/argp-help.c3
-rw-r--r--argp/argp.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/argp/argp-help.c b/argp/argp-help.c
index e18ee418f5..2120ab1526 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1315,8 +1315,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state,
   int multiple = 0;
   const struct argp_child *child = argp->children;
   const char *tdoc = gettext (argp->args_doc), *nl = 0;
-  const char *fdoc = filter_doc (tdoc, ARGP_KEY_HELP_ARGS_DOC,
-				 state ? state->root_argp : 0, state);
+  const char *fdoc = filter_doc (tdoc, ARGP_KEY_HELP_ARGS_DOC, argp, state);
 
   if (fdoc)
     {
diff --git a/argp/argp.h b/argp/argp.h
index 886742a36e..61ed8351e6 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -396,7 +396,7 @@ extern void (*argp_program_version_hook) __P ((FILE *__stream,
    argp_help if the ARGP_HELP_BUG_ADDR flag is set (as it is by various
    standard help messages), embedded in a sentence that says something like
    `Report bugs to ADDR.'.  */
-__const extern char *argp_program_bug_address;
+extern __const char *argp_program_bug_address;
 
 /* The exit status that argp will use when exiting due to a parsing error.
    If not defined or set by the user program, this defaults to EX_USAGE from