about summary refs log tree commit diff
path: root/misc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-10-04 18:07:28 +0000
committerUlrich Drepper <drepper@redhat.com>2007-10-04 18:07:28 +0000
commitb80bfc8b53153ca9aefa32ecd51ac4d6cfdbb842 (patch)
tree1e9b5dfe430789c64e1dbd0a998d5f24a4f001dd /misc
parentfae56ce808e36e8112d15189bf4337b3a39ee683 (diff)
downloadglibc-b80bfc8b53153ca9aefa32ecd51ac4d6cfdbb842.tar.gz
glibc-b80bfc8b53153ca9aefa32ecd51ac4d6cfdbb842.tar.xz
glibc-b80bfc8b53153ca9aefa32ecd51ac4d6cfdbb842.zip
* misc/error.h: Remove support for use outside of libc. We have to
	include <features.h> now.  Include <bits/error.h> if possible.
	* misc/bits/error.h: New file.
Diffstat (limited to 'misc')
-rw-r--r--misc/bits/error.h2
-rw-r--r--misc/error.h27
2 files changed, 10 insertions, 19 deletions
diff --git a/misc/bits/error.h b/misc/bits/error.h
index 7089768c3b..aafed58e7d 100644
--- a/misc/bits/error.h
+++ b/misc/bits/error.h
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #ifndef	_ERROR_H
-# error "Never include <bits/error2.h> directly; use <error.h> instead."
+# error "Never include <bits/error.h> directly; use <error.h> instead."
 #endif
 
 
diff --git a/misc/error.h b/misc/error.h
index f25005b0e8..ce99a941d2 100644
--- a/misc/error.h
+++ b/misc/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995, 1996, 1997, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995,1996,1997,2003,2006,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,22 +20,10 @@
 #ifndef _ERROR_H
 #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) || __STRICT_ANSI__
-#  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.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
-#endif
+#include <features.h>
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
+
+__BEGIN_DECLS
 
 /* Print a message with `fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
@@ -60,8 +48,11 @@ extern unsigned int error_message_count;
    variable controls whether this mode is selected or not.  */
 extern int error_one_per_line;
 
-#ifdef	__cplusplus
-}
+
+#if defined __extern_always_inline && defined __va_arg_pack
+# include <bits/error.h>
 #endif
 
+__END_DECLS
+
 #endif /* error.h */