# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1161605257 0
# Node ID 6c966254d5186d27ef5182e722f242771a10866b
# Parent  bb5f8250cc4b72a895aebbad519b606dac17617d
Avoid clash with mingw's definition of __argc and __argv as macros.

diff -r bb5f8250cc4b -r 6c966254d518 ChangeLog
--- a/ChangeLog	Mon Oct 23 11:27:37 2006 +0000
+++ b/ChangeLog	Mon Oct 23 12:07:37 2006 +0000
@@ -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 -r bb5f8250cc4b -r 6c966254d518 lib/argp.h
--- a/lib/argp.h	Mon Oct 23 11:27:37 2006 +0000
+++ b/lib/argp.h	Mon Oct 23 12:07:37 2006 +0000
@@ -413,11 +413,11 @@
    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);