[BACK]Return to error.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srclib

Diff for /embedaddon/libiconv/srclib/error.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:48 version 1.1.1.2, 2012/05/29 09:29:43
Line 1 Line 1
 /* Declaration for error-reporting function  /* Declaration for error-reporting function
   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008 Free Software Foundation, Inc.   Copyright (C) 1995-1997, 2003, 2006, 2008-2011 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.     This file is part of the GNU C Library.
   
    This program is free software: you can redistribute it and/or modify     This program is free software: you can redistribute it and/or modify
Line 18 Line 19
 #ifndef _ERROR_H  #ifndef _ERROR_H
 #define _ERROR_H 1  #define _ERROR_H 1
   
#ifndef __attribute__/* The __attribute__ feature is available in gcc versions 2.5 and later.
/* This feature is available in gcc versions 2.5 and later.  */   The __-protected variants of the attributes 'format' and 'printf' are
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)   accepted by gcc versions 2.6.4 (effectively 2.7) and later.
#  define __attribute__(Spec) /* empty */   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
# endif   gnulib and libintl do '#define printf __printf__' when they override
/* The __-protected variants of `format' and `printf' attributes   the 'printf' function.  */
   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
#  define __format__ format#else
#  define __printf__ printf# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
# endif 
 #endif  #endif
   
#ifdef  __cplusplus#ifdef __cplusplus
 extern "C" {  extern "C" {
 #endif  #endif
   
Line 40  extern "C" { Line 40  extern "C" {
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */     If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
   
 extern void error (int __status, int __errnum, const char *__format, ...)  extern void error (int __status, int __errnum, const char *__format, ...)
     __attribute__ ((__format__ (__printf__, 3, 4)));     _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
   
 extern void error_at_line (int __status, int __errnum, const char *__fname,  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)));     _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6));
   
 /* If NULL, error will flush stdout, then print on stderr the program  /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this     name, a colon and a space.  Otherwise, error will call this
Line 58  extern DLL_VARIABLE unsigned int error_message_count; Line 58  extern DLL_VARIABLE unsigned int error_message_count;
    variable controls whether this mode is selected or not.  */     variable controls whether this mode is selected or not.  */
 extern DLL_VARIABLE int error_one_per_line;  extern DLL_VARIABLE int error_one_per_line;
   
#ifdef  __cplusplus#ifdef __cplusplus
 }  }
 #endif  #endif
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>