strtoumax: fix typo in previous commit.

[gnulib.git] / lib / argv-iter.h

diff --git a/lib/argv-iter.h b/lib/argv-iter.h
index 537fb1e..82237f5 100644 (file)
--- a/lib/argv-iter.h
+++ b/lib/argv-iter.h
@@ -1,5 +1,5 @@
 /* Iterate over arguments from argv or --files0-from=FILE
-   Copyright (C) 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 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
@@ -17,15 +17,10 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-struct argv_iterator;
-enum argv_iter_err;
+/* Definition of _GL_ARG_NONNULL.  */
+#include "arg-nonnull.h"
 
-#undef _ATTRIBUTE_NONNULL_
-#if __GNUC__ == 3 && __GNUC_MINOR__ >= 3 || 3 < __GNUC__
-# define _ATTRIBUTE_NONNULL_(m) __attribute__ ((__nonnull__ (m)))
-#else
-# define _ATTRIBUTE_NONNULL_(m)
-#endif
+struct argv_iterator;
 
 enum argv_iter_err
 {
@@ -36,12 +31,12 @@ enum argv_iter_err
 };
 
 struct argv_iterator *argv_iter_init_argv (char **argv)
-  _ATTRIBUTE_NONNULL_ (1);
+  _GL_ARG_NONNULL ((1));
 struct argv_iterator *argv_iter_init_stream (FILE *fp)
-  _ATTRIBUTE_NONNULL_ (1);
+  _GL_ARG_NONNULL ((1));
 char *argv_iter (struct argv_iterator *, enum argv_iter_err *)
-  _ATTRIBUTE_NONNULL_ (1) _ATTRIBUTE_NONNULL_ (2);
+  _GL_ARG_NONNULL ((1, 2));
 size_t argv_iter_n_args (struct argv_iterator const *)
-  _ATTRIBUTE_NONNULL_ (1);
+  _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1));
 void argv_iter_free (struct argv_iterator *)
-  _ATTRIBUTE_NONNULL_ (1);
+  _GL_ARG_NONNULL ((1));