about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--libio/libio.h7
-rw-r--r--sysdeps/generic/_G_config.h1
-rw-r--r--sysdeps/gnu/_G_config.h1
-rw-r--r--sysdeps/mach/hurd/_G_config.h1
5 files changed, 8 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 03e912c5c4..b8d5fcb213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-08  Marek Polacek  <polacek@redhat.com>
+
+	* libio/libio.h: Remove _G_HAVE_SYS_CDEFS conditional.
+	* sysdeps/mach/hurd/_G_config.h: Remove _G_HAVE_SYS_CDEFS macro.
+	* sysdeps/gnu/_G_config.h: Likewise.
+	* sysdeps/generic/_G_config.h: Likewise.
+
 2012-02-08  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Reduce ldouble ULPs for jn
diff --git a/libio/libio.h b/libio/libio.h
index c37211f8ec..c9a2fcf040 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -59,12 +59,7 @@
 #endif
 
 #ifndef __P
-# if _G_HAVE_SYS_CDEFS
-#  include <sys/cdefs.h>
-# else
-#  define __P(p) p
-#  define __PMT(p) p
-# endif
+# include <sys/cdefs.h>
 #endif /*!__P*/
 
 #define _IO_UNIFIED_JUMPTABLES 1
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index 0838cfbabb..6f756829e7 100644
--- a/sysdeps/generic/_G_config.h
+++ b/sysdeps/generic/_G_config.h
@@ -60,7 +60,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
 
 /* These library features are always available in the GNU C library.  */
 #define _G_HAVE_ATEXIT 1
-#define _G_HAVE_SYS_CDEFS 1
 #define _G_HAVE_SYS_WAIT 1
 #define _G_NEED_STDARG_H 1
 #define _G_va_list __gnuc_va_list
diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/gnu/_G_config.h
index 07ad8ca8f3..9d6e23bb4e 100644
--- a/sysdeps/gnu/_G_config.h
+++ b/sysdeps/gnu/_G_config.h
@@ -60,7 +60,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
 
 /* These library features are always available in the GNU C library.  */
 #define _G_HAVE_ATEXIT 1
-#define _G_HAVE_SYS_CDEFS 1
 #define _G_HAVE_SYS_WAIT 1
 #define _G_NEED_STDARG_H 1
 #define _G_va_list __gnuc_va_list
diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h
index 1d2b262792..9ecd4aad39 100644
--- a/sysdeps/mach/hurd/_G_config.h
+++ b/sysdeps/mach/hurd/_G_config.h
@@ -60,7 +60,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
 
 /* These library features are always available in the GNU C library.  */
 #define _G_HAVE_ATEXIT 1
-#define _G_HAVE_SYS_CDEFS 1
 #define _G_HAVE_SYS_WAIT 1
 #define _G_NEED_STDARG_H 1
 #define _G_va_list __gnuc_va_list