Remove pre-ISO C support

No more __const.

3 files changed, 26 insertions, 28 deletions

diff --git a/sysdeps/generic/inttypes.h b/sysdeps/generic/inttypes.h
index bf0fffa5c2..c231c51a2d 100644
--- a/sysdeps/generic/inttypes.h
+++ b/sysdeps/generic/inttypes.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2001, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1997-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
@@ -302,20 +302,20 @@ extern imaxdiv_t imaxdiv (intmax_t __numer, intmax_t __denom)
       __THROW __attribute__ ((__const__));
 
 /* Like `strtol' but convert to `intmax_t'.  */
-extern intmax_t strtoimax (__const char *__restrict __nptr,
+extern intmax_t strtoimax (const char *__restrict __nptr,
 			   char **__restrict __endptr, int __base) __THROW;
 
 /* Like `strtoul' but convert to `uintmax_t'.  */
-extern uintmax_t strtoumax (__const char *__restrict __nptr,
+extern uintmax_t strtoumax (const char *__restrict __nptr,
 			    char ** __restrict __endptr, int __base) __THROW;
 
 /* Like `wcstol' but convert to `intmax_t'.  */
-extern intmax_t wcstoimax (__const __gwchar_t *__restrict __nptr,
+extern intmax_t wcstoimax (const __gwchar_t *__restrict __nptr,
 			   __gwchar_t **__restrict __endptr, int __base)
      __THROW;
 
 /* Like `wcstoul' but convert to `uintmax_t'.  */
-extern uintmax_t wcstoumax (__const __gwchar_t *__restrict __nptr,
+extern uintmax_t wcstoumax (const __gwchar_t *__restrict __nptr,
 			    __gwchar_t ** __restrict __endptr, int __base)
      __THROW;
 
@@ -323,44 +323,43 @@ extern uintmax_t wcstoumax (__const __gwchar_t *__restrict __nptr,
 
 # if __WORDSIZE == 64
 
-extern long int __strtol_internal (__const char *__restrict __nptr,
+extern long int __strtol_internal (const char *__restrict __nptr,
 				   char **__restrict __endptr,
 				   int __base, int __group)
   __THROW __nonnull ((1)) __wur;
 /* Like `strtol' but convert to `intmax_t'.  */
 __extern_inline intmax_t
-__NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr,
+__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr,
 		  int base))
 {
   return __strtol_internal (nptr, endptr, base, 0);
 }
 
-extern unsigned long int __strtoul_internal (__const char *
-					     __restrict __nptr,
+extern unsigned long int __strtoul_internal (const char *__restrict __nptr,
 					     char ** __restrict __endptr,
 					     int __base, int __group)
   __THROW __nonnull ((1)) __wur;
 /* Like `strtoul' but convert to `uintmax_t'.  */
 __extern_inline uintmax_t
-__NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr,
+__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr,
 		  int base))
 {
   return __strtoul_internal (nptr, endptr, base, 0);
 }
 
-extern long int __wcstol_internal (__const __gwchar_t * __restrict __nptr,
+extern long int __wcstol_internal (const __gwchar_t * __restrict __nptr,
 				   __gwchar_t **__restrict __endptr,
 				   int __base, int __group)
   __THROW __nonnull ((1)) __wur;
 /* Like `wcstol' but convert to `intmax_t'.  */
 __extern_inline intmax_t
-__NTH (wcstoimax (__const __gwchar_t *__restrict nptr,
+__NTH (wcstoimax (const __gwchar_t *__restrict nptr,
 		  __gwchar_t **__restrict endptr, int base))
 {
   return __wcstol_internal (nptr, endptr, base, 0);
 }
 
-extern unsigned long int __wcstoul_internal (__const __gwchar_t *
+extern unsigned long int __wcstoul_internal (const __gwchar_t *
 					     __restrict __nptr,
 					     __gwchar_t **
 					     __restrict __endptr,
@@ -368,7 +367,7 @@ extern unsigned long int __wcstoul_internal (__const __gwchar_t *
   __THROW __nonnull ((1)) __wur;
 /* Like `wcstoul' but convert to `uintmax_t'.  */
 __extern_inline uintmax_t
-__NTH (wcstoumax (__const __gwchar_t *__restrict nptr,
+__NTH (wcstoumax (const __gwchar_t *__restrict nptr,
 		  __gwchar_t **__restrict endptr, int base))
 {
   return __wcstoul_internal (nptr, endptr, base, 0);
@@ -377,20 +376,20 @@ __NTH (wcstoumax (__const __gwchar_t *__restrict nptr,
 # else /* __WORDSIZE == 32 */
 
 __extension__
-extern long long int __strtoll_internal (__const char *__restrict __nptr,
+extern long long int __strtoll_internal (const char *__restrict __nptr,
 					 char **__restrict __endptr,
 					 int __base, int __group)
   __THROW __nonnull ((1)) __wur;
 /* Like `strtol' but convert to `intmax_t'.  */
 __extern_inline intmax_t
-__NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr,
+__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr,
 		  int base))
 {
   return __strtoll_internal (nptr, endptr, base, 0);
 }
 
 __extension__
-extern unsigned long long int __strtoull_internal (__const char *
+extern unsigned long long int __strtoull_internal (const char *
 						   __restrict __nptr,
 						   char **
 						   __restrict __endptr,
@@ -399,21 +398,20 @@ extern unsigned long long int __strtoull_internal (__const char *
   __THROW __nonnull ((1)) __wur;
 /* Like `strtoul' but convert to `uintmax_t'.  */
 __extern_inline uintmax_t
-__NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr,
+__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr,
 		  int base))
 {
   return __strtoull_internal (nptr, endptr, base, 0);
 }
 
 __extension__
-extern long long int __wcstoll_internal (__const __gwchar_t *
-					 __restrict __nptr,
+extern long long int __wcstoll_internal (const __gwchar_t *__restrict __nptr,
 					 __gwchar_t **__restrict __endptr,
 					 int __base, int __group)
   __THROW __nonnull ((1)) __wur;
 /* Like `wcstol' but convert to `intmax_t'.  */
 __extern_inline intmax_t
-__NTH (wcstoimax (__const __gwchar_t *__restrict nptr,
+__NTH (wcstoimax (const __gwchar_t *__restrict nptr,
 		  __gwchar_t **__restrict endptr, int base))
 {
   return __wcstoll_internal (nptr, endptr, base, 0);
@@ -421,7 +419,7 @@ __NTH (wcstoimax (__const __gwchar_t *__restrict nptr,
 
 
 __extension__
-extern unsigned long long int __wcstoull_internal (__const __gwchar_t *
+extern unsigned long long int __wcstoull_internal (const __gwchar_t *
 						   __restrict __nptr,
 						   __gwchar_t **
 						   __restrict __endptr,
@@ -430,7 +428,7 @@ extern unsigned long long int __wcstoull_internal (__const __gwchar_t *
   __THROW __nonnull ((1)) __wur;
 /* Like `wcstoul' but convert to `uintmax_t'.  */
 __extern_inline uintmax_t
-__NTH (wcstoumax (__const __gwchar_t *__restrict nptr,
+__NTH (wcstoumax (const __gwchar_t *__restrict nptr,
 		  __gwchar_t **__restrict endptr, int base))
 {
   return __wcstoull_internal (nptr, endptr, base, 0);
diff --git a/sysdeps/generic/net/if.h b/sysdeps/generic/net/if.h
index a497d0861a..86ada0f610 100644
--- a/sysdeps/generic/net/if.h
+++ b/sysdeps/generic/net/if.h
@@ -1,5 +1,5 @@
 /* net/if.h -- declarations for inquiring about network interfaces
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 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
@@ -27,7 +27,7 @@ __BEGIN_DECLS
 
 /* Convert an interface name to an index, and vice versa.  */
 
-extern unsigned int if_nametoindex (__const char *__ifname) __THROW;
+extern unsigned int if_nametoindex (const char *__ifname) __THROW;
 extern char *if_indextoname (unsigned int __ifindex, char *__ifname) __THROW;
 
 /* Return a list of all interfaces and their indices.  */
diff --git a/sysdeps/generic/sys/swap.h b/sysdeps/generic/sys/swap.h
index c7b58b99ea..82af5d3139 100644
--- a/sysdeps/generic/sys/swap.h
+++ b/sysdeps/generic/sys/swap.h
@@ -1,5 +1,5 @@
 /* Calls to enable and disable swapping on specified locations.  Unix version.
-   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2000, 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
@@ -25,9 +25,9 @@
 
 /* Make the block special device PATH available to the system for swapping.
    This call is restricted to the super-user.  */
-extern int swapon (__const char *__path) __THROW;
+extern int swapon (const char *__path) __THROW;
 
 /* Stop using block special device PATH for swapping.  */
-extern int swapoff (__const char *__path) __THROW;
+extern int swapoff (const char *__path) __THROW;
 
 #endif /* sys/swap.h */