Mercurial > hg > octave-nkf > gnulib-hg
changeset 7549:9bda6f37e39b
Avoid clash with mingw's definition of __argc and __argv as macros.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 23 Oct 2006 12:07:37 +0000 |
parents | 7caba67886be |
children | 0d3d27f21643 |
files | ChangeLog lib/argp.h |
diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/lib/argp.h +++ b/lib/argp.h @@ -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);