Remove pre-ISO C support

No more __const.

2 files changed, 32 insertions, 32 deletions

diff --git a/libio/bits/stdio.h b/libio/bits/stdio.h
index 49303c6900..7fb1b84231 100644
--- a/libio/bits/stdio.h
+++ b/libio/bits/stdio.h
@@ -1,5 +1,5 @@
 /* Optimizing macros and inline functions for stdio functions.
-   Copyright (C) 1998, 2000, 2001, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1998,2000,2001,2004,2007,2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@
 # if !(__USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline)
 /* Write formatted output to stdout from argument list ARG.  */
 __STDIO_INLINE int
-vprintf (__const char *__restrict __fmt, _G_va_list __arg)
+vprintf (const char *__restrict __fmt, _G_va_list __arg)
 {
   return vfprintf (stdout, __fmt, __arg);
 }
diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h
index 8c25aaae50..a4166f7555 100644
--- a/libio/bits/stdio2.h
+++ b/libio/bits/stdio2.h
@@ -1,5 +1,5 @@
 /* Checking macros for stdio functions.
-   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2007, 2008, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,14 +22,14 @@
 #endif
 
 extern int __sprintf_chk (char *__restrict __s, int __flag, size_t __slen,
-			  __const char *__restrict __format, ...) __THROW;
+			  const char *__restrict __format, ...) __THROW;
 extern int __vsprintf_chk (char *__restrict __s, int __flag, size_t __slen,
-			   __const char *__restrict __format,
+			   const char *__restrict __format,
 			   _G_va_list __ap) __THROW;
 
 #ifdef __va_arg_pack
 __extern_always_inline int
-__NTH (sprintf (char *__restrict __s, __const char *__restrict __fmt, ...))
+__NTH (sprintf (char *__restrict __s, const char *__restrict __fmt, ...))
 {
   return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
 				  __bos (__s), __fmt, __va_arg_pack ());
@@ -41,7 +41,7 @@ __NTH (sprintf (char *__restrict __s, __const char *__restrict __fmt, ...))
 #endif
 
 __extern_always_inline int
-__NTH (vsprintf (char *__restrict __s, __const char *__restrict __fmt,
+__NTH (vsprintf (char *__restrict __s, const char *__restrict __fmt,
 		 _G_va_list __ap))
 {
   return __builtin___vsprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
@@ -51,16 +51,16 @@ __NTH (vsprintf (char *__restrict __s, __const char *__restrict __fmt,
 #if defined __USE_BSD || defined __USE_ISOC99 || defined __USE_UNIX98
 
 extern int __snprintf_chk (char *__restrict __s, size_t __n, int __flag,
-			   size_t __slen, __const char *__restrict __format,
+			   size_t __slen, const char *__restrict __format,
 			   ...) __THROW;
 extern int __vsnprintf_chk (char *__restrict __s, size_t __n, int __flag,
-			    size_t __slen, __const char *__restrict __format,
+			    size_t __slen, const char *__restrict __format,
 			    _G_va_list __ap) __THROW;
 
 # ifdef __va_arg_pack
 __extern_always_inline int
 __NTH (snprintf (char *__restrict __s, size_t __n,
-		 __const char *__restrict __fmt, ...))
+		 const char *__restrict __fmt, ...))
 {
   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
 				   __bos (__s), __fmt, __va_arg_pack ());
@@ -73,7 +73,7 @@ __NTH (snprintf (char *__restrict __s, size_t __n,
 
 __extern_always_inline int
 __NTH (vsnprintf (char *__restrict __s, size_t __n,
-		  __const char *__restrict __fmt, _G_va_list __ap))
+		  const char *__restrict __fmt, _G_va_list __ap))
 {
   return __builtin___vsnprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
 				    __bos (__s), __fmt, __ap);
@@ -84,23 +84,23 @@ __NTH (vsnprintf (char *__restrict __s, size_t __n,
 #if __USE_FORTIFY_LEVEL > 1
 
 extern int __fprintf_chk (FILE *__restrict __stream, int __flag,
-			  __const char *__restrict __format, ...);
-extern int __printf_chk (int __flag, __const char *__restrict __format, ...);
+			  const char *__restrict __format, ...);
+extern int __printf_chk (int __flag, const char *__restrict __format, ...);
 extern int __vfprintf_chk (FILE *__restrict __stream, int __flag,
-			   __const char *__restrict __format, _G_va_list __ap);
-extern int __vprintf_chk (int __flag, __const char *__restrict __format,
+			   const char *__restrict __format, _G_va_list __ap);
+extern int __vprintf_chk (int __flag, const char *__restrict __format,
 			  _G_va_list __ap);
 
 # ifdef __va_arg_pack
 __extern_always_inline int
-fprintf (FILE *__restrict __stream, __const char *__restrict __fmt, ...)
+fprintf (FILE *__restrict __stream, const char *__restrict __fmt, ...)
 {
   return __fprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt,
 			__va_arg_pack ());
 }
 
 __extern_always_inline int
-printf (__const char *__restrict __fmt, ...)
+printf (const char *__restrict __fmt, ...)
 {
   return __printf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
 }
@@ -112,7 +112,7 @@ printf (__const char *__restrict __fmt, ...)
 # endif
 
 __extern_always_inline int
-vprintf (__const char *__restrict __fmt, _G_va_list __ap)
+vprintf (const char *__restrict __fmt, _G_va_list __ap)
 {
 #ifdef __USE_EXTERN_INLINES
   return __vfprintf_chk (stdout, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
@@ -123,7 +123,7 @@ vprintf (__const char *__restrict __fmt, _G_va_list __ap)
 
 __extern_always_inline int
 vfprintf (FILE *__restrict __stream,
-	  __const char *__restrict __fmt, _G_va_list __ap)
+	  const char *__restrict __fmt, _G_va_list __ap)
 {
   return __vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
 }
@@ -131,36 +131,36 @@ vfprintf (FILE *__restrict __stream,
 # ifdef __USE_GNU
 
 extern int __asprintf_chk (char **__restrict __ptr, int __flag,
-			   __const char *__restrict __fmt, ...)
+			   const char *__restrict __fmt, ...)
      __THROW __attribute__ ((__format__ (__printf__, 3, 4))) __wur;
 extern int __vasprintf_chk (char **__restrict __ptr, int __flag,
-			    __const char *__restrict __fmt, _G_va_list __arg)
+			    const char *__restrict __fmt, _G_va_list __arg)
      __THROW __attribute__ ((__format__ (__printf__, 3, 0))) __wur;
-extern int __dprintf_chk (int __fd, int __flag, __const char *__restrict __fmt,
+extern int __dprintf_chk (int __fd, int __flag, const char *__restrict __fmt,
 			  ...) __attribute__ ((__format__ (__printf__, 3, 4)));
 extern int __vdprintf_chk (int __fd, int __flag,
-			   __const char *__restrict __fmt, _G_va_list __arg)
+			   const char *__restrict __fmt, _G_va_list __arg)
      __attribute__ ((__format__ (__printf__, 3, 0)));
 extern int __obstack_printf_chk (struct obstack *__restrict __obstack,
-				 int __flag, __const char *__restrict __format,
+				 int __flag, const char *__restrict __format,
 				 ...)
      __THROW __attribute__ ((__format__ (__printf__, 3, 4)));
 extern int __obstack_vprintf_chk (struct obstack *__restrict __obstack,
 				  int __flag,
-				  __const char *__restrict __format,
+				  const char *__restrict __format,
 				  _G_va_list __args)
      __THROW __attribute__ ((__format__ (__printf__, 3, 0)));
 
 #  ifdef __va_arg_pack
 __extern_always_inline int
-__NTH (asprintf (char **__restrict __ptr, __const char *__restrict __fmt, ...))
+__NTH (asprintf (char **__restrict __ptr, const char *__restrict __fmt, ...))
 {
   return __asprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt,
 			 __va_arg_pack ());
 }
 
 __extern_always_inline int
-__NTH (__asprintf (char **__restrict __ptr, __const char *__restrict __fmt,
+__NTH (__asprintf (char **__restrict __ptr, const char *__restrict __fmt,
 		   ...))
 {
   return __asprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt,
@@ -168,7 +168,7 @@ __NTH (__asprintf (char **__restrict __ptr, __const char *__restrict __fmt,
 }
 
 __extern_always_inline int
-dprintf (int __fd, __const char *__restrict __fmt, ...)
+dprintf (int __fd, const char *__restrict __fmt, ...)
 {
   return __dprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt,
 			__va_arg_pack ());
@@ -176,7 +176,7 @@ dprintf (int __fd, __const char *__restrict __fmt, ...)
 
 __extern_always_inline int
 __NTH (obstack_printf (struct obstack *__restrict __obstack,
-		       __const char *__restrict __fmt, ...))
+		       const char *__restrict __fmt, ...))
 {
   return __obstack_printf_chk (__obstack, __USE_FORTIFY_LEVEL - 1, __fmt,
 			       __va_arg_pack ());
@@ -193,21 +193,21 @@ __NTH (obstack_printf (struct obstack *__restrict __obstack,
 #  endif
 
 __extern_always_inline int
-__NTH (vasprintf (char **__restrict __ptr, __const char *__restrict __fmt,
+__NTH (vasprintf (char **__restrict __ptr, const char *__restrict __fmt,
 		  _G_va_list __ap))
 {
   return __vasprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
 }
 
 __extern_always_inline int
-vdprintf (int __fd, __const char *__restrict __fmt, _G_va_list __ap)
+vdprintf (int __fd, const char *__restrict __fmt, _G_va_list __ap)
 {
   return __vdprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
 }
 
 __extern_always_inline int
 __NTH (obstack_vprintf (struct obstack *__restrict __obstack,
-			__const char *__restrict __fmt, _G_va_list __ap))
+			const char *__restrict __fmt, _G_va_list __ap))
 {
   return __obstack_vprintf_chk (__obstack, __USE_FORTIFY_LEVEL - 1, __fmt,
 				__ap);