diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libio/libio.h | 14 | ||||
| -rw-r--r-- | sysdeps/generic/_G_config.h | 1 | ||||
| -rw-r--r-- | sysdeps/gnu/_G_config.h | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/_G_config.h | 1 |
5 files changed, 13 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index a77ef92d76..22da7cacd9 100644 --- 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 14bb9a663e..5fe1bac091 100644 --- 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 71974ca3be..139f746524 100644 --- 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 604fa2e93e..313f35a792 100644 --- 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 70de3c67d4..7d6baef06d 100644 --- 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 |