From 572608140684279bcb2d8aa77dd8500c0fd66cd7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 23 Oct 2006 12:07:37 +0000 Subject: [PATCH] Avoid clash with mingw's definition of __argc and __argv as macros. --- ChangeLog | 7 +++++++ lib/argp.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf37605f5..a9eb085c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-10-23 Bruno Haible + Paul Eggert + + * lib/argp.h (argp_parse, __argp_parse): Comment out the identifiers + __argc, __argv from the declaration. (They are defined as macros on + mingw.) + 2006-10-22 Bruno Haible * doc/gnulib-intro.texi: New file. diff --git a/lib/argp.h b/lib/argp.h index f22a56be3..1b7cf3ad0 100644 --- a/lib/argp.h +++ b/lib/argp.h @@ -413,11 +413,11 @@ struct argp_state returned. This function may also call exit unless the ARGP_NO_HELP flag is set. INPUT is a pointer to a value to be passed in to the parser. */ extern error_t argp_parse (const struct argp *__restrict __argp, - int __argc, char **__restrict __argv, + int /*argc*/, char **__restrict /*argv*/, unsigned __flags, int *__restrict __arg_index, void *__restrict __input); extern error_t __argp_parse (const struct argp *__restrict __argp, - int __argc, char **__restrict __argv, + int /*argc*/, char **__restrict /*argv*/, unsigned __flags, int *__restrict __arg_index, void *__restrict __input); -- 2.11.0