Avoid clash with mingw's definition of __argc and __argv as macros.

diff --git a/ChangeLog b/ChangeLog
index bf37605f584ac8226c9dea83ca1e1e2a3500acd6..a9eb085c371b4af3b2daea58b7176231a627252b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-23  Bruno Haible  <bruno@clisp.org>
+            Paul Eggert  <eggert@cs.ucla.edu>
+
+       * 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  <bruno@clisp.org>
 
        * doc/gnulib-intro.texi: New file.

diff --git a/lib/argp.h b/lib/argp.h
index f22a56be3e9ae7211f7e746a1bd64249427e3a9a..1b7cf3ad01bcd5d335edfc19591cdf0d0d719120 100644 (file)
--- 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);
 \f