Remove pre-ISO C support

No more __const.

8 files changed, 97 insertions, 97 deletions

diff --git a/io/bits/fcntl2.h b/io/bits/fcntl2.h
index fbe85852cc..715d96a57b 100644
--- a/io/bits/fcntl2.h
+++ b/io/bits/fcntl2.h
@@ -1,5 +1,5 @@
 /* Checking macros for fcntl functions.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -24,13 +24,13 @@
 /* Check that calls to open and openat with O_CREAT set have an
    appropriate third/fourth parameter.  */
 #ifndef __USE_FILE_OFFSET64
-extern int __open_2 (__const char *__path, int __oflag) __nonnull ((1));
-extern int __REDIRECT (__open_alias, (__const char *__path, int __oflag, ...),
+extern int __open_2 (const char *__path, int __oflag) __nonnull ((1));
+extern int __REDIRECT (__open_alias, (const char *__path, int __oflag, ...),
 		       open) __nonnull ((1));
 #else
-extern int __REDIRECT (__open_2, (__const char *__path, int __oflag),
+extern int __REDIRECT (__open_2, (const char *__path, int __oflag),
 		       __open64_2) __nonnull ((1));
-extern int __REDIRECT (__open_alias, (__const char *__path, int __oflag, ...),
+extern int __REDIRECT (__open_alias, (const char *__path, int __oflag, ...),
 		       open64) __nonnull ((1));
 #endif
 __errordecl (__open_too_many_args,
@@ -39,7 +39,7 @@ __errordecl (__open_missing_mode,
 	     "open with O_CREAT in second argument needs 3 arguments");
 
 __extern_always_inline int
-open (__const char *__path, int __oflag, ...)
+open (const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
     __open_too_many_args ();
@@ -62,8 +62,8 @@ open (__const char *__path, int __oflag, ...)
 
 
 #ifdef __USE_LARGEFILE64
-extern int __open64_2 (__const char *__path, int __oflag) __nonnull ((1));
-extern int __REDIRECT (__open64_alias, (__const char *__path, int __oflag,
+extern int __open64_2 (const char *__path, int __oflag) __nonnull ((1));
+extern int __REDIRECT (__open64_alias, (const char *__path, int __oflag,
 					...), open64) __nonnull ((1));
 __errordecl (__open64_too_many_args,
 	     "open64 can be called either with 2 or 3 arguments, not more");
@@ -71,7 +71,7 @@ __errordecl (__open64_missing_mode,
 	     "open64 with O_CREAT in second argument needs 3 arguments");
 
 __extern_always_inline int
-open64 (__const char *__path, int __oflag, ...)
+open64 (const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
     __open64_too_many_args ();
@@ -96,16 +96,16 @@ open64 (__const char *__path, int __oflag, ...)
 
 #ifdef __USE_ATFILE
 # ifndef __USE_FILE_OFFSET64
-extern int __openat_2 (int __fd, __const char *__path, int __oflag)
+extern int __openat_2 (int __fd, const char *__path, int __oflag)
      __nonnull ((2));
-extern int __REDIRECT (__openat_alias, (int __fd, __const char *__path,
+extern int __REDIRECT (__openat_alias, (int __fd, const char *__path,
 					int __oflag, ...), openat)
      __nonnull ((2));
 # else
-extern int __REDIRECT (__openat_2, (int __fd, __const char *__path,
+extern int __REDIRECT (__openat_2, (int __fd, const char *__path,
 				    int __oflag), __openat64_2)
      __nonnull ((2));
-extern int __REDIRECT (__openat_alias, (int __fd, __const char *__path,
+extern int __REDIRECT (__openat_alias, (int __fd, const char *__path,
 					int __oflag, ...), openat64)
      __nonnull ((2));
 # endif
@@ -115,7 +115,7 @@ __errordecl (__openat_missing_mode,
 	     "openat with O_CREAT in third argument needs 4 arguments");
 
 __extern_always_inline int
-openat (int __fd, __const char *__path, int __oflag, ...)
+openat (int __fd, const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
     __openat_too_many_args ();
@@ -138,9 +138,9 @@ openat (int __fd, __const char *__path, int __oflag, ...)
 
 
 # ifdef __USE_LARGEFILE64
-extern int __openat64_2 (int __fd, __const char *__path, int __oflag)
+extern int __openat64_2 (int __fd, const char *__path, int __oflag)
      __nonnull ((2));
-extern int __REDIRECT (__openat64_alias, (int __fd, __const char *__path,
+extern int __REDIRECT (__openat64_alias, (int __fd, const char *__path,
 					  int __oflag, ...), openat64)
      __nonnull ((2));
 __errordecl (__openat64_too_many_args,
@@ -149,7 +149,7 @@ __errordecl (__openat64_missing_mode,
 	     "openat64 with O_CREAT in third argument needs 4 arguments");
 
 __extern_always_inline int
-openat64 (int __fd, __const char *__path, int __oflag, ...)
+openat64 (int __fd, const char *__path, int __oflag, ...)
 {
   if (__va_arg_pack_len () > 1)
     __openat64_too_many_args ();
diff --git a/io/fcntl.h b/io/fcntl.h
index c582a9e6f2..edfbb545dc 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007,2009,2010,2011
+/* Copyright (C) 1991,1992,1994-2001,2003-2007,2009-2011,2012
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -131,17 +131,17 @@ extern int fcntl (int __fd, int __cmd, ...);
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 #ifndef __USE_FILE_OFFSET64
-extern int open (__const char *__file, int __oflag, ...) __nonnull ((1));
+extern int open (const char *__file, int __oflag, ...) __nonnull ((1));
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (open, (__const char *__file, int __oflag, ...), open64)
+extern int __REDIRECT (open, (const char *__file, int __oflag, ...), open64)
      __nonnull ((1));
 # else
 #  define open open64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int open64 (__const char *__file, int __oflag, ...) __nonnull ((1));
+extern int open64 (const char *__file, int __oflag, ...) __nonnull ((1));
 #endif
 
 #ifdef __USE_ATFILE
@@ -155,18 +155,18 @@ extern int open64 (__const char *__file, int __oflag, ...) __nonnull ((1));
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 # ifndef __USE_FILE_OFFSET64
-extern int openat (int __fd, __const char *__file, int __oflag, ...)
+extern int openat (int __fd, const char *__file, int __oflag, ...)
      __nonnull ((2));
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (openat, (int __fd, __const char *__file, int __oflag,
+extern int __REDIRECT (openat, (int __fd, const char *__file, int __oflag,
 				...), openat64) __nonnull ((2));
 #  else
 #   define openat openat64
 #  endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int openat64 (int __fd, __const char *__file, int __oflag, ...)
+extern int openat64 (int __fd, const char *__file, int __oflag, ...)
      __nonnull ((2));
 # endif
 #endif
@@ -177,17 +177,17 @@ extern int openat64 (int __fd, __const char *__file, int __oflag, ...)
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 #ifndef __USE_FILE_OFFSET64
-extern int creat (__const char *__file, __mode_t __mode) __nonnull ((1));
+extern int creat (const char *__file, __mode_t __mode) __nonnull ((1));
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (creat, (__const char *__file, __mode_t __mode),
+extern int __REDIRECT (creat, (const char *__file, __mode_t __mode),
 		       creat64) __nonnull ((1));
 # else
 #  define creat creat64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int creat64 (__const char *__file, __mode_t __mode) __nonnull ((1));
+extern int creat64 (const char *__file, __mode_t __mode) __nonnull ((1));
 #endif
 
 #if !defined F_LOCK && (defined __USE_MISC || (defined __USE_XOPEN_EXTENDED \
diff --git a/io/ftw.h b/io/ftw.h
index 4bdff88c6f..e4c4884144 100644
--- a/io/ftw.h
+++ b/io/ftw.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1996-1999,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1996-1999,2003,2004,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
@@ -112,19 +112,19 @@ struct FTW
 
 
 /* Convenient types for callback functions.  */
-typedef int (*__ftw_func_t) (__const char *__filename,
-			     __const struct stat *__status, int __flag);
+typedef int (*__ftw_func_t) (const char *__filename,
+			     const struct stat *__status, int __flag);
 #ifdef __USE_LARGEFILE64
-typedef int (*__ftw64_func_t) (__const char *__filename,
-			       __const struct stat64 *__status, int __flag);
+typedef int (*__ftw64_func_t) (const char *__filename,
+			       const struct stat64 *__status, int __flag);
 #endif
 #ifdef __USE_XOPEN_EXTENDED
-typedef int (*__nftw_func_t) (__const char *__filename,
-			      __const struct stat *__status, int __flag,
+typedef int (*__nftw_func_t) (const char *__filename,
+			      const struct stat *__status, int __flag,
 			      struct FTW *__info);
 # ifdef __USE_LARGEFILE64
-typedef int (*__nftw64_func_t) (__const char *__filename,
-				__const struct stat64 *__status,
+typedef int (*__nftw64_func_t) (const char *__filename,
+				const struct stat64 *__status,
 				int __flag, struct FTW *__info);
 # endif
 #endif
@@ -134,18 +134,18 @@ typedef int (*__nftw64_func_t) (__const char *__filename,
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 #ifndef __USE_FILE_OFFSET64
-extern int ftw (__const char *__dir, __ftw_func_t __func, int __descriptors)
+extern int ftw (const char *__dir, __ftw_func_t __func, int __descriptors)
      __nonnull ((1, 2));
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (ftw, (__const char *__dir, __ftw_func_t __func,
+extern int __REDIRECT (ftw, (const char *__dir, __ftw_func_t __func,
 			     int __descriptors), ftw64) __nonnull ((1, 2));
 # else
 #  define ftw ftw64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int ftw64 (__const char *__dir, __ftw64_func_t __func,
+extern int ftw64 (const char *__dir, __ftw64_func_t __func,
 		  int __descriptors) __nonnull ((1, 2));
 #endif
 
@@ -156,11 +156,11 @@ extern int ftw64 (__const char *__dir, __ftw64_func_t __func,
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 # ifndef __USE_FILE_OFFSET64
-extern int nftw (__const char *__dir, __nftw_func_t __func, int __descriptors,
+extern int nftw (const char *__dir, __nftw_func_t __func, int __descriptors,
 		 int __flag) __nonnull ((1, 2));
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (nftw, (__const char *__dir, __nftw_func_t __func,
+extern int __REDIRECT (nftw, (const char *__dir, __nftw_func_t __func,
 			      int __descriptors, int __flag), nftw64)
      __nonnull ((1, 2));
 #  else
@@ -168,7 +168,7 @@ extern int __REDIRECT (nftw, (__const char *__dir, __nftw_func_t __func,
 #  endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int nftw64 (__const char *__dir, __nftw64_func_t __func,
+extern int nftw64 (const char *__dir, __nftw64_func_t __func,
 		   int __descriptors, int __flag) __nonnull ((1, 2));
 # endif
 #endif
diff --git a/io/sys/poll.h b/io/sys/poll.h
index 4085b785ee..a9bd18005a 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -1,5 +1,5 @@
 /* Compatibility definitions for System V `poll' interface.
-   Copyright (C) 1994,1996-2001,2004,2005,2006 Free Software Foundation, Inc.
+   Copyright (C) 1994,1996-2001,2004-2006,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
@@ -65,8 +65,8 @@ extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int ppoll (struct pollfd *__fds, nfds_t __nfds,
-		  __const struct timespec *__timeout,
-		  __const __sigset_t *__ss);
+		  const struct timespec *__timeout,
+		  const __sigset_t *__ss);
 #endif
 
 __END_DECLS
diff --git a/io/sys/stat.h b/io/sys/stat.h
index ac740cad38..de348bf105 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009, 2010
+/* Copyright (C) 1991, 1992, 1995-2007, 2009, 2010, 2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -208,7 +208,7 @@ __BEGIN_DECLS
 
 #ifndef __USE_FILE_OFFSET64
 /* Get file attributes for FILE and put them in BUF.  */
-extern int stat (__const char *__restrict __file,
+extern int stat (const char *__restrict __file,
 		 struct stat *__restrict __buf) __THROW __nonnull ((1, 2));
 
 /* Get file attributes for the file, device, pipe, or socket
@@ -216,7 +216,7 @@ extern int stat (__const char *__restrict __file,
 extern int fstat (int __fd, struct stat *__buf) __THROW __nonnull ((2));
 #else
 # ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (stat, (__const char *__restrict __file,
+extern int __REDIRECT_NTH (stat, (const char *__restrict __file,
 				  struct stat *__restrict __buf), stat64)
      __nonnull ((1, 2));
 extern int __REDIRECT_NTH (fstat, (int __fd, struct stat *__buf), fstat64)
@@ -227,7 +227,7 @@ extern int __REDIRECT_NTH (fstat, (int __fd, struct stat *__buf), fstat64)
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int stat64 (__const char *__restrict __file,
+extern int stat64 (const char *__restrict __file,
 		   struct stat64 *__restrict __buf) __THROW __nonnull ((1, 2));
 extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
 #endif
@@ -237,12 +237,12 @@ extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
    Relative path names are interpreted relative to FD unless FD is
    AT_FDCWD.  */
 # ifndef __USE_FILE_OFFSET64
-extern int fstatat (int __fd, __const char *__restrict __file,
+extern int fstatat (int __fd, const char *__restrict __file,
 		    struct stat *__restrict __buf, int __flag)
      __THROW __nonnull ((2, 3));
 # else
 #  ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (fstatat, (int __fd, __const char *__restrict __file,
+extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file,
 				     struct stat *__restrict __buf,
 				     int __flag),
 			   fstatat64) __nonnull ((2, 3));
@@ -252,7 +252,7 @@ extern int __REDIRECT_NTH (fstatat, (int __fd, __const char *__restrict __file,
 # endif
 
 # ifdef __USE_LARGEFILE64
-extern int fstatat64 (int __fd, __const char *__restrict __file,
+extern int fstatat64 (int __fd, const char *__restrict __file,
 		      struct stat64 *__restrict __buf, int __flag)
      __THROW __nonnull ((2, 3));
 # endif
@@ -262,12 +262,12 @@ extern int fstatat64 (int __fd, __const char *__restrict __file,
 # ifndef __USE_FILE_OFFSET64
 /* Get file attributes about FILE and put them in BUF.
    If FILE is a symbolic link, do not follow it.  */
-extern int lstat (__const char *__restrict __file,
+extern int lstat (const char *__restrict __file,
 		  struct stat *__restrict __buf) __THROW __nonnull ((1, 2));
 # else
 #  ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (lstat,
-			   (__const char *__restrict __file,
+			   (const char *__restrict __file,
 			    struct stat *__restrict __buf), lstat64)
      __nonnull ((1, 2));
 #  else
@@ -275,7 +275,7 @@ extern int __REDIRECT_NTH (lstat,
 #  endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int lstat64 (__const char *__restrict __file,
+extern int lstat64 (const char *__restrict __file,
 		    struct stat64 *__restrict __buf)
      __THROW __nonnull ((1, 2));
 # endif
@@ -283,14 +283,14 @@ extern int lstat64 (__const char *__restrict __file,
 
 /* Set file access permissions for FILE to MODE.
    If FILE is a symbolic link, this affects its target instead.  */
-extern int chmod (__const char *__file, __mode_t __mode)
+extern int chmod (const char *__file, __mode_t __mode)
      __THROW __nonnull ((1));
 
 #ifdef __USE_BSD
 /* Set file access permissions for FILE to MODE.
    If FILE is a symbolic link, this affects the link itself
    rather than its target.  */
-extern int lchmod (__const char *__file, __mode_t __mode)
+extern int lchmod (const char *__file, __mode_t __mode)
      __THROW __nonnull ((1));
 #endif
 
@@ -302,7 +302,7 @@ extern int fchmod (int __fd, __mode_t __mode) __THROW;
 #ifdef __USE_ATFILE
 /* Set file access permissions of FILE relative to
    the directory FD is open on.  */
-extern int fchmodat (int __fd, __const char *__file, __mode_t __mode,
+extern int fchmodat (int __fd, const char *__file, __mode_t __mode,
 		     int __flag)
      __THROW __nonnull ((2)) __wur;
 #endif /* Use ATFILE.  */
@@ -320,14 +320,14 @@ extern __mode_t getumask (void) __THROW;
 #endif
 
 /* Create a new directory named PATH, with permission bits MODE.  */
-extern int mkdir (__const char *__path, __mode_t __mode)
+extern int mkdir (const char *__path, __mode_t __mode)
      __THROW __nonnull ((1));
 
 #ifdef __USE_ATFILE
 /* Like mkdir, create a new directory with permission bits MODE.  But
    interpret relative PATH names relative to the directory associated
    with FD.  */
-extern int mkdirat (int __fd, __const char *__path, __mode_t __mode)
+extern int mkdirat (int __fd, const char *__path, __mode_t __mode)
      __THROW __nonnull ((2));
 #endif
 
@@ -335,43 +335,43 @@ extern int mkdirat (int __fd, __const char *__path, __mode_t __mode)
    and device number DEV (which can be constructed from major and minor
    device numbers with the `makedev' macro above).  */
 #if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-extern int mknod (__const char *__path, __mode_t __mode, __dev_t __dev)
+extern int mknod (const char *__path, __mode_t __mode, __dev_t __dev)
      __THROW __nonnull ((1));
 
 # ifdef __USE_ATFILE
 /* Like mknod, create a new device file with permission bits MODE and
    device number DEV.  But interpret relative PATH names relative to
    the directory associated with FD.  */
-extern int mknodat (int __fd, __const char *__path, __mode_t __mode,
+extern int mknodat (int __fd, const char *__path, __mode_t __mode,
 		    __dev_t __dev) __THROW __nonnull ((2));
 # endif
 #endif
 
 
 /* Create a new FIFO named PATH, with permission bits MODE.  */
-extern int mkfifo (__const char *__path, __mode_t __mode)
+extern int mkfifo (const char *__path, __mode_t __mode)
      __THROW __nonnull ((1));
 
 #ifdef __USE_ATFILE
 /* Like mkfifo, create a new FIFO with permission bits MODE.  But
    interpret relative PATH names relative to the directory associated
    with FD.  */
-extern int mkfifoat (int __fd, __const char *__path, __mode_t __mode)
+extern int mkfifoat (int __fd, const char *__path, __mode_t __mode)
      __THROW __nonnull ((2));
 #endif
 
 #ifdef __USE_ATFILE
 /* Set file access and modification times relative to directory file
    descriptor.  */
-extern int utimensat (int __fd, __const char *__path,
-		      __const struct timespec __times[2],
+extern int utimensat (int __fd, const char *__path,
+		      const struct timespec __times[2],
 		      int __flags)
      __THROW __nonnull ((2));
 #endif
 
 #ifdef __USE_XOPEN2K8
 /* Set file access and modification times of the file associated with FD.  */
-extern int futimens (int __fd, __const struct timespec __times[2]) __THROW;
+extern int futimens (int __fd, const struct timespec __times[2]) __THROW;
 #endif
 
 /* To allow the `struct stat' structure and the file type `mode_t'
@@ -400,11 +400,11 @@ extern int futimens (int __fd, __const struct timespec __times[2]) __THROW;
 #ifndef __USE_FILE_OFFSET64
 extern int __fxstat (int __ver, int __fildes, struct stat *__stat_buf)
      __THROW __nonnull ((3));
-extern int __xstat (int __ver, __const char *__filename,
+extern int __xstat (int __ver, const char *__filename,
 		    struct stat *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __lxstat (int __ver, __const char *__filename,
+extern int __lxstat (int __ver, const char *__filename,
 		     struct stat *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __fxstatat (int __ver, int __fildes, __const char *__filename,
+extern int __fxstatat (int __ver, int __fildes, const char *__filename,
 		       struct stat *__stat_buf, int __flag)
      __THROW __nonnull ((3, 4));
 #else
@@ -412,14 +412,14 @@ extern int __fxstatat (int __ver, int __fildes, __const char *__filename,
 extern int __REDIRECT_NTH (__fxstat, (int __ver, int __fildes,
 				      struct stat *__stat_buf), __fxstat64)
      __nonnull ((3));
-extern int __REDIRECT_NTH (__xstat, (int __ver, __const char *__filename,
+extern int __REDIRECT_NTH (__xstat, (int __ver, const char *__filename,
 				     struct stat *__stat_buf), __xstat64)
      __nonnull ((2, 3));
-extern int __REDIRECT_NTH (__lxstat, (int __ver, __const char *__filename,
+extern int __REDIRECT_NTH (__lxstat, (int __ver, const char *__filename,
 				      struct stat *__stat_buf), __lxstat64)
      __nonnull ((2, 3));
 extern int __REDIRECT_NTH (__fxstatat, (int __ver, int __fildes,
-					__const char *__filename,
+					const char *__filename,
 					struct stat *__stat_buf, int __flag),
 			   __fxstatat64) __nonnull ((3, 4));
 
@@ -433,18 +433,18 @@ extern int __REDIRECT_NTH (__fxstatat, (int __ver, int __fildes,
 #ifdef __USE_LARGEFILE64
 extern int __fxstat64 (int __ver, int __fildes, struct stat64 *__stat_buf)
      __THROW __nonnull ((3));
-extern int __xstat64 (int __ver, __const char *__filename,
+extern int __xstat64 (int __ver, const char *__filename,
 		      struct stat64 *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __lxstat64 (int __ver, __const char *__filename,
+extern int __lxstat64 (int __ver, const char *__filename,
 		       struct stat64 *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __fxstatat64 (int __ver, int __fildes, __const char *__filename,
+extern int __fxstatat64 (int __ver, int __fildes, const char *__filename,
 			 struct stat64 *__stat_buf, int __flag)
      __THROW __nonnull ((3, 4));
 #endif
-extern int __xmknod (int __ver, __const char *__path, __mode_t __mode,
+extern int __xmknod (int __ver, const char *__path, __mode_t __mode,
 		     __dev_t *__dev) __THROW __nonnull ((2, 4));
 
-extern int __xmknodat (int __ver, int __fd, __const char *__path,
+extern int __xmknodat (int __ver, int __fd, const char *__path,
 		       __mode_t __mode, __dev_t *__dev)
      __THROW __nonnull ((3, 5));
 
@@ -452,14 +452,14 @@ extern int __xmknodat (int __ver, int __fd, __const char *__path,
 /* Inlined versions of the real stat and mknod functions.  */
 
 __extern_inline int
-__NTH (stat (__const char *__path, struct stat *__statbuf))
+__NTH (stat (const char *__path, struct stat *__statbuf))
 {
   return __xstat (_STAT_VER, __path, __statbuf);
 }
 
 # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 __extern_inline int
-__NTH (lstat (__const char *__path, struct stat *__statbuf))
+__NTH (lstat (const char *__path, struct stat *__statbuf))
 {
   return __lxstat (_STAT_VER, __path, __statbuf);
 }
@@ -473,7 +473,7 @@ __NTH (fstat (int __fd, struct stat *__statbuf))
 
 # ifdef __USE_ATFILE
 __extern_inline int
-__NTH (fstatat (int __fd, __const char *__filename, struct stat *__statbuf,
+__NTH (fstatat (int __fd, const char *__filename, struct stat *__statbuf,
 		int __flag))
 {
   return __fxstatat (_STAT_VER, __fd, __filename, __statbuf, __flag);
@@ -482,7 +482,7 @@ __NTH (fstatat (int __fd, __const char *__filename, struct stat *__statbuf,
 
 # if defined __USE_MISC || defined __USE_BSD
 __extern_inline int
-__NTH (mknod (__const char *__path, __mode_t __mode, __dev_t __dev))
+__NTH (mknod (const char *__path, __mode_t __mode, __dev_t __dev))
 {
   return __xmknod (_MKNOD_VER, __path, __mode, &__dev);
 }
@@ -490,7 +490,7 @@ __NTH (mknod (__const char *__path, __mode_t __mode, __dev_t __dev))
 
 # ifdef __USE_ATFILE
 __extern_inline int
-__NTH (mknodat (int __fd, __const char *__path, __mode_t __mode,
+__NTH (mknodat (int __fd, const char *__path, __mode_t __mode,
 		__dev_t __dev))
 {
   return __xmknodat (_MKNOD_VER, __fd, __path, __mode, &__dev);
@@ -501,14 +501,14 @@ __NTH (mknodat (int __fd, __const char *__path, __mode_t __mode,
   && (! defined __USE_FILE_OFFSET64 \
       || (defined __REDIRECT_NTH && defined __OPTIMIZE__))
 __extern_inline int
-__NTH (stat64 (__const char *__path, struct stat64 *__statbuf))
+__NTH (stat64 (const char *__path, struct stat64 *__statbuf))
 {
   return __xstat64 (_STAT_VER, __path, __statbuf);
 }
 
 #  if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 __extern_inline int
-__NTH (lstat64 (__const char *__path, struct stat64 *__statbuf))
+__NTH (lstat64 (const char *__path, struct stat64 *__statbuf))
 {
   return __lxstat64 (_STAT_VER, __path, __statbuf);
 }
@@ -522,7 +522,7 @@ __NTH (fstat64 (int __fd, struct stat64 *__statbuf))
 
 #  ifdef __USE_ATFILE
 __extern_inline int
-__NTH (fstatat64 (int __fd, __const char *__filename, struct stat64 *__statbuf,
+__NTH (fstatat64 (int __fd, const char *__filename, struct stat64 *__statbuf,
 		  int __flag))
 {
   return __fxstatat64 (_STAT_VER, __fd, __filename, __statbuf, __flag);
diff --git a/io/sys/statfs.h b/io/sys/statfs.h
index 3b2226b41e..0d00276df7 100644
--- a/io/sys/statfs.h
+++ b/io/sys/statfs.h
@@ -1,5 +1,5 @@
 /* Definitions for getting information about a filesystem.
-   Copyright (C) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2004, 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
@@ -29,19 +29,19 @@ __BEGIN_DECLS
 
 /* Return information about the filesystem on which FILE resides.  */
 #ifndef __USE_FILE_OFFSET64
-extern int statfs (__const char *__file, struct statfs *__buf)
+extern int statfs (const char *__file, struct statfs *__buf)
      __THROW __nonnull ((1, 2));
 #else
 # ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (statfs,
-			   (__const char *__file, struct statfs *__buf),
+			   (const char *__file, struct statfs *__buf),
 			   statfs64) __nonnull ((1, 2));
 # else
 #  define statfs statfs64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int statfs64 (__const char *__file, struct statfs64 *__buf)
+extern int statfs64 (const char *__file, struct statfs64 *__buf)
      __THROW __nonnull ((1, 2));
 #endif
 
diff --git a/io/sys/statvfs.h b/io/sys/statvfs.h
index 909662bc50..1440fc051d 100644
--- a/io/sys/statvfs.h
+++ b/io/sys/statvfs.h
@@ -1,5 +1,5 @@
 /* Definitions for getting information about a filesystem.
-   Copyright (C) 1998, 1999, 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2004, 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
@@ -49,13 +49,13 @@ __BEGIN_DECLS
 
 /* Return information about the filesystem on which FILE resides.  */
 #ifndef __USE_FILE_OFFSET64
-extern int statvfs (__const char *__restrict __file,
+extern int statvfs (const char *__restrict __file,
 		    struct statvfs *__restrict __buf)
      __THROW __nonnull ((1, 2));
 #else
 # ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (statvfs,
-			   (__const char *__restrict __file,
+			   (const char *__restrict __file,
 			    struct statvfs *__restrict __buf), statvfs64)
      __nonnull ((1, 2));
 # else
@@ -63,7 +63,7 @@ extern int __REDIRECT_NTH (statvfs,
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int statvfs64 (__const char *__restrict __file,
+extern int statvfs64 (const char *__restrict __file,
 		      struct statvfs64 *__restrict __buf)
      __THROW __nonnull ((1, 2));
 #endif
diff --git a/io/utime.h b/io/utime.h
index dd5d265708..06120a6392 100644
--- a/io/utime.h
+++ b/io/utime.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1992,1996-1999,2004,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
@@ -43,8 +43,8 @@ struct utimbuf
 
 /* Set the access and modification times of FILE to those given in
    *FILE_TIMES.  If FILE_TIMES is NULL, set them to the current time.  */
-extern int utime (__const char *__file,
-		  __const struct utimbuf *__file_times)
+extern int utime (const char *__file,
+		  const struct utimbuf *__file_times)
      __THROW __nonnull ((1));
 
 __END_DECLS