diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
| commit | 43455e09166350b1237d2168d1b008c9f47ebaf0 (patch) | |
| tree | 42390fa1645e01c728923b9874cc61a35823cffd /libio | |
| parent | 6ac2f2df75d3b48ab502f0b0275b7e838e90c0b1 (diff) | |
| parent | 965a54a4eecc6cf5c53718f07290171f744c4d6c (diff) | |
| download | glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.zip glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.gz glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/libio.h | 14 | ||||
| -rw-r--r-- | libio/libioP.h | 6 |
2 files changed, 3 insertions, 17 deletions
diff --git a/libio/libio.h b/libio/libio.h index 3ec2eb3..8997524 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -62,13 +62,8 @@ # if _G_HAVE_SYS_CDEFS # include <sys/cdefs.h> # else -# ifdef __STDC__ -# define __P(p) p -# define __PMT(p) p -# else -# define __P(p) () -# define __PMT(p) () -# endif +# define __P(p) p +# define __PMT(p) p # endif #endif /*!__P*/ @@ -77,11 +72,6 @@ # define _PARAMS(protos) __P(protos) #endif /*!_PARAMS*/ -#ifndef __STDC__ -# ifndef const -# define const -# endif -#endif #define _IO_UNIFIED_JUMPTABLES 1 #ifndef _G_HAVE_PRINTF_FP # define _IO_USE_DTOA 1 diff --git a/libio/libioP.h b/libio/libioP.h index 9bbdd28..305a6e3 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -927,11 +927,7 @@ VTABLE_LABEL(builtinbuf_vtable, builtinbuf, 10) # endif #endif /* !defined(builtinbuf_vtable) && defined(__cplusplus) */ -#if defined(__STDC__) || defined(__cplusplus) -# define _IO_va_start(args, last) va_start(args, last) -#else -# define _IO_va_start(args, last) va_start(args) -#endif +#define _IO_va_start(args, last) va_start(args, last) extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf; |