Remove _G_NEED_STDARG_H.

diff --git a/ChangeLog b/ChangeLog
index a77ef92d76a908d5bdd9374e967368997effb168..22da7cacd919209027641002ccffa334e4fa5ac7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-20  Joseph Myers  <joseph@codesourcery.com>
+
+       * libio/libio.h [_G_NEED_STDARG_H]: Make code unconditional.
+       * sysdeps/generic/_G_config.h (_G_NEED_STDARG_H): Remove.
+       * sysdeps/gnu/_G_config.h (_G_NEED_STDARG_H): Remove.
+       * sysdeps/mach/hurd/_G_config.h (_G_NEED_STDARG_H): Remove.
+
 2012-09-19  Dmitry V. Levin  <ldv@altlinux.org>
 
        [BZ #14579]

diff --git a/libio/libio.h b/libio/libio.h
index 14bb9a663e83c383408f6084cb333a1d1567b912..5fe1bac091d6d44b029a6170b61e2a6a7b9d9227 100644 (file)
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -47,15 +47,13 @@
 #define _IO_va_list _G_va_list
 #define _IO_wint_t _G_wint_t
 
-#ifdef _G_NEED_STDARG_H
 /* This define avoids name pollution if we're using GNU stdarg.h */
-# define __need___va_list
-# include <stdarg.h>
-# ifdef __GNUC_VA_LIST
-#  undef _IO_va_list
-#  define _IO_va_list __gnuc_va_list
-# endif /* __GNUC_VA_LIST */
-#endif
+#define __need___va_list
+#include <stdarg.h>
+#ifdef __GNUC_VA_LIST
+# undef _IO_va_list
+# define _IO_va_list __gnuc_va_list
+#endif /* __GNUC_VA_LIST */
 
 #ifndef __P
 # include <sys/cdefs.h>

diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index 71974ca3bedeefd45c3efb90a3d5671dd0623abb..139f746524dc853c9d456bc704c10c378fbf939f 100644 (file)
--- a/sysdeps/generic/_G_config.h
+++ b/sysdeps/generic/_G_config.h
@@ -53,7 +53,6 @@ typedef union
 
 /* These library features are always available in the GNU C library.  */
 #define _G_HAVE_SYS_WAIT 1
-#define _G_NEED_STDARG_H 1
 #define _G_va_list __gnuc_va_list
 
 #define _G_HAVE_MMAP 1

diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/gnu/_G_config.h
index 604fa2e93e26867222b9780590dedb5423497a44..313f35a7920cffea3b544b7f3965ad89bf568e81 100644 (file)
--- a/sysdeps/gnu/_G_config.h
+++ b/sysdeps/gnu/_G_config.h
@@ -53,7 +53,6 @@ typedef union
 
 /* These library features are always available in the GNU C library.  */
 #define _G_HAVE_SYS_WAIT 1
-#define _G_NEED_STDARG_H 1
 #define _G_va_list __gnuc_va_list
 
 #define _G_HAVE_MMAP 1

diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h
index 70de3c67d4f6e72178f7f0fbbaeff268ed06b1c1..7d6baef06d5e9d360d2fbf63cfcf62fe450cc86d 100644 (file)
--- a/sysdeps/mach/hurd/_G_config.h
+++ b/sysdeps/mach/hurd/_G_config.h
@@ -53,7 +53,6 @@ typedef union
 
 /* These library features are always available in the GNU C library.  */
 #define _G_HAVE_SYS_WAIT 1
-#define _G_NEED_STDARG_H 1
 #define _G_va_list __gnuc_va_list
 
 #define _G_HAVE_MMAP 1