diff options
Diffstat (limited to 'tests/error.h')
| -rw-r--r-- | tests/error.h | 24 | 
1 files changed, 12 insertions, 12 deletions
| diff --git a/tests/error.h b/tests/error.h index 6d496811..9deef02d 100644 --- a/tests/error.h +++ b/tests/error.h @@ -1,5 +1,6 @@  /* Declaration for error-reporting function -   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008 Free Software Foundation, Inc. +   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 Free Software +   Foundation, Inc.     This file is part of the GNU C Library.     This program is free software: you can redistribute it and/or modify @@ -19,19 +20,18 @@  #define _ERROR_H 1  #ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later.  */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) -#  define __attribute__(Spec) /* empty */ -# endif -/* The __-protected variants of `format' and `printf' attributes -   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */ +/* The __attribute__ feature is available in gcc versions 2.5 and later. +   The __-protected variants of the attributes 'format' and 'printf' are +   accepted by gcc versions 2.6.4 (effectively 2.7) and later. +   We enable __attribute__ only if these are supported too, because +   gnulib and libintl do '#define printf __printf__' when they override +   the 'printf' function.  */  # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -#  define __format__ format -#  define __printf__ printf +#  define __attribute__(Spec)   /* empty */  # endif  #endif -#ifdef	__cplusplus +#ifdef __cplusplus  extern "C" {  #endif @@ -43,7 +43,7 @@ extern void error (int __status, int __errnum, const char *__format, ...)       __attribute__ ((__format__ (__printf__, 3, 4)));  extern void error_at_line (int __status, int __errnum, const char *__fname, -			   unsigned int __lineno, const char *__format, ...) +                           unsigned int __lineno, const char *__format, ...)       __attribute__ ((__format__ (__printf__, 5, 6)));  /* If NULL, error will flush stdout, then print on stderr the program @@ -58,7 +58,7 @@ extern unsigned int error_message_count;     variable controls whether this mode is selected or not.  */  extern int error_one_per_line; -#ifdef	__cplusplus +#ifdef __cplusplus  }  #endif | 
