From 7071ad79db0886c0f17946feea71439400c706a9 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 26 Jan 2012 20:49:22 +0000
Subject: Remove __STDC__ conditionals from installed headers.

---
 libio/libio.h | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'libio')

diff --git a/libio/libio.h b/libio/libio.h
index 3ec2eb3fdf..8997524829 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
-- 
cgit v1.2.3


From 965a54a4eecc6cf5c53718f07290171f744c4d6c Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 26 Jan 2012 23:31:37 +0000
Subject: Remove __STDC__ conditionals from non-installed headers.

---
 libio/libioP.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'libio')

diff --git a/libio/libioP.h b/libio/libioP.h
index 9bbdd28f61..305a6e3fff 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;
 
-- 
cgit v1.2.3