summaryrefslogtreecommitdiffstats
path: root/gl/error.h
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2010-04-08 01:11:46 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2010-04-13 01:26:35 (GMT)
commit74da141e618ef99959d509cb2e7be35a348a39db (patch)
tree88ebc38b381a1021fc2d74864a71e230ae591c3d /gl/error.h
parentc63a4f726a0b6ad8cf6040f947754a81fd4683bb (diff)
downloadmonitoring-plugins-74da141e618ef99959d509cb2e7be35a348a39db.tar.gz
Sync with the latest Gnulib code (177f525)
Signed-off-by: Thomas Guyot-Sionnest <dermoth@aei.ca>
Diffstat (limited to 'gl/error.h')
-rw-r--r--gl/error.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/gl/error.h b/gl/error.h
index 6d49681..9deef02 100644
--- a/gl/error.h
+++ b/gl/error.h
@@ -1,5 +1,6 @@
1/* Declaration for error-reporting function 1/* Declaration for error-reporting function
2 Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008 Free Software Foundation, Inc. 2 Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 Free Software
3 Foundation, Inc.
3 This file is part of the GNU C Library. 4 This file is part of the GNU C Library.
4 5
5 This program is free software: you can redistribute it and/or modify 6 This program is free software: you can redistribute it and/or modify
@@ -19,19 +20,18 @@
19#define _ERROR_H 1 20#define _ERROR_H 1
20 21
21#ifndef __attribute__ 22#ifndef __attribute__
22/* This feature is available in gcc versions 2.5 and later. */ 23/* The __attribute__ feature is available in gcc versions 2.5 and later.
23# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) 24 The __-protected variants of the attributes 'format' and 'printf' are
24# define __attribute__(Spec) /* empty */ 25 accepted by gcc versions 2.6.4 (effectively 2.7) and later.
25# endif 26 We enable __attribute__ only if these are supported too, because
26/* The __-protected variants of `format' and `printf' attributes 27 gnulib and libintl do '#define printf __printf__' when they override
27 are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ 28 the 'printf' function. */
28# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) 29# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
29# define __format__ format 30# define __attribute__(Spec) /* empty */
30# define __printf__ printf
31# endif 31# endif
32#endif 32#endif
33 33
34#ifdef __cplusplus 34#ifdef __cplusplus
35extern "C" { 35extern "C" {
36#endif 36#endif
37 37
@@ -43,7 +43,7 @@ extern void error (int __status, int __errnum, const char *__format, ...)
43 __attribute__ ((__format__ (__printf__, 3, 4))); 43 __attribute__ ((__format__ (__printf__, 3, 4)));
44 44
45extern void error_at_line (int __status, int __errnum, const char *__fname, 45extern void error_at_line (int __status, int __errnum, const char *__fname,
46 unsigned int __lineno, const char *__format, ...) 46 unsigned int __lineno, const char *__format, ...)
47 __attribute__ ((__format__ (__printf__, 5, 6))); 47 __attribute__ ((__format__ (__printf__, 5, 6)));
48 48
49/* If NULL, error will flush stdout, then print on stderr the program 49/* If NULL, error will flush stdout, then print on stderr the program
@@ -58,7 +58,7 @@ extern unsigned int error_message_count;
58 variable controls whether this mode is selected or not. */ 58 variable controls whether this mode is selected or not. */
59extern int error_one_per_line; 59extern int error_one_per_line;
60 60
61#ifdef __cplusplus 61#ifdef __cplusplus
62} 62}
63#endif 63#endif
64 64