argv-iter: avoid variadic macro

* gl/lib/argv-iter.h (_ATTRIBUTE_NONNULL_): Don't assume C99 variadic
macros are portable yet; needed for at least IRIX/MIPSpro.
* THANKS: Update.
Reported by Stuart Shelton.

diff --git a/THANKS b/THANKS
index 5c25321d79b1ab14f3cc419bf7b1a3760c7e7d57..81911da07171e5326ece6ed1c9f136c91f86a57d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -513,6 +513,7 @@ Steven G. Johnson                   stevenj@alum.mit.edu
 Steven Mocking                      ufo@quicknet.nl
 Steven P Watson                     steven@magelico.net
 Stuart Kemp                         skemp@peter.bmc.com
+Stuart Shelton                      stuart@shelton.me
 Sven Joachim                        svenjoac@gmx.de
 Szakacsits Szabolcs                 szaka@sienet.hu
 Tadayoshi Funaba                    tadf@kt.rim.or.jp

diff --git a/gl/lib/argv-iter.h b/gl/lib/argv-iter.h
index 06a397c9ed7a10539c55ae41d11192d24e6acb67..537fb1ea29958857b82b4ba6aa2ebb022f78532b 100644 (file)
--- a/gl/lib/argv-iter.h
+++ b/gl/lib/argv-iter.h
@@ -1,5 +1,5 @@
 /* Iterate over arguments from argv or --files0-from=FILE
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,9 +22,9 @@ enum argv_iter_err;
 
 #undef _ATTRIBUTE_NONNULL_
 #if __GNUC__ == 3 && __GNUC_MINOR__ >= 3 || 3 < __GNUC__
-# define _ATTRIBUTE_NONNULL_(m,...) __attribute__ ((__nonnull__ (m)))
+# define _ATTRIBUTE_NONNULL_(m) __attribute__ ((__nonnull__ (m)))
 #else
-# define _ATTRIBUTE_NONNULL_(m,...)
+# define _ATTRIBUTE_NONNULL_(m)
 #endif
 
 enum argv_iter_err
@@ -40,7 +40,7 @@ struct argv_iterator *argv_iter_init_argv (char **argv)
 struct argv_iterator *argv_iter_init_stream (FILE *fp)
   _ATTRIBUTE_NONNULL_ (1);
 char *argv_iter (struct argv_iterator *, enum argv_iter_err *)
-  _ATTRIBUTE_NONNULL_ (1, 2);
+  _ATTRIBUTE_NONNULL_ (1) _ATTRIBUTE_NONNULL_ (2);
 size_t argv_iter_n_args (struct argv_iterator const *)
   _ATTRIBUTE_NONNULL_ (1);
 void argv_iter_free (struct argv_iterator *)