X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fverror.h;h=ec4ff1d4a2e57a2997ea9efcc8fd1ad2f7e0a39f;hb=20bfdb40dc24b41b0775cb7c1b59f8831690fdfd;hp=625ef102ee09ecbeb296be3ad29860a064ef2955;hpb=4f861fcbb2f6cefe311e085c97eb3c1694fd6557;p=gnulib.git

diff --git a/lib/verror.h b/lib/verror.h
index 625ef102e..ec4ff1d4a 100644
--- a/lib/verror.h
+++ b/lib/verror.h
@@ -1,27 +1,27 @@
 /* Declaration for va_list error-reporting function
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _VERROR_H
 #define _VERROR_H 1
 
-#include "error.h"
 #include <stdarg.h>
 
-#ifdef	__cplusplus
+#include "error.h" /* for _GL_ATTRIBUTE_FORMAT */
+
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -33,7 +33,7 @@ extern "C" {
 
 extern void verror (int __status, int __errnum, const char *__format,
                     va_list __args)
-     __attribute__ ((__format__ (__printf__, 3, 0)));
+     _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0));
 
 /* Print a message with `vfprintf (stderr, FORMAT, ARGS)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
@@ -45,9 +45,9 @@ extern void verror (int __status, int __errnum, const char *__format,
 extern void verror_at_line (int __status, int __errnum, const char *__fname,
                             unsigned int __lineno, const char *__format,
                             va_list __args)
-     __attribute__ ((__format__ (__printf__, 5, 0)));
+     _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 0));
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif