Remove pre-ISO C support

No more __const.

36 files changed, 264 insertions, 267 deletions

diff --git a/include/aio.h b/include/aio.h
index be40c0bcef..c81dae9706 100644
--- a/include/aio.h
+++ b/include/aio.h
@@ -2,7 +2,7 @@
 #include <rt/aio.h>
 
 /* Now define the internal interfaces.  */
-extern void __aio_init (__const struct aioinit *__init);
+extern void __aio_init (const struct aioinit *__init);
 
 /* Flag to signal we need to be compatible with glibc < 2.4 in
    lio_listio and we do not issue events for each individual list
diff --git a/include/aliases.h b/include/aliases.h
index 84c832fdd1..f7cfafcd6c 100644
--- a/include/aliases.h
+++ b/include/aliases.h
@@ -9,11 +9,11 @@ extern int __old_getaliasent_r (struct aliasent *__restrict __result_buf,
 				char *__restrict __buffer, size_t __buflen,
 				struct aliasent **__restrict __result);
 
-extern int __getaliasbyname_r (__const char *__restrict __name,
+extern int __getaliasbyname_r (const char *__restrict __name,
 			       struct aliasent *__restrict __result_buf,
 			       char *__restrict __buffer, size_t __buflen,
 			       struct aliasent **__restrict __result);
-extern int __old_getaliasbyname_r (__const char *__restrict __name,
+extern int __old_getaliasbyname_r (const char *__restrict __name,
 				   struct aliasent *__restrict __result_buf,
 				   char *__restrict __buffer, size_t __buflen,
 				   struct aliasent **__restrict __result);
@@ -22,10 +22,10 @@ extern int __old_getaliasbyname_r (__const char *__restrict __name,
 extern enum nss_status _nss_ ## service ## _setaliasent (void);		     \
 extern enum nss_status _nss_ ## service ## _endaliasent (void);		     \
 extern enum nss_status _nss_ ## service ## _getaliasent_r		     \
-                       (struct aliasent *alias, char *buffer, size_t buflen, \
+		       (struct aliasent *alias, char *buffer, size_t buflen, \
 			int *errnop);					     \
 extern enum nss_status _nss_ ## service ## _getaliasbyname_r		     \
-                       (const char *name, struct aliasent *alias,	     \
+		       (const char *name, struct aliasent *alias,	     \
 			char *buffer, size_t buflen, int *errnop);
 
 
diff --git a/include/argz.h b/include/argz.h
index 1b97ed308d..4f45b0bf17 100644
--- a/include/argz.h
+++ b/include/argz.h
@@ -4,7 +4,7 @@
 
 libc_hidden_proto (argz_delete)
 
-extern size_t __argz_count_internal (__const char *__argz, size_t __len)
+extern size_t __argz_count_internal (const char *__argz, size_t __len)
      __attribute_pure__ attribute_hidden;
 extern void __argz_stringify_internal (char *__argz, size_t __len, int __sep)
      attribute_hidden;
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 4e2c62390b..dc44341140 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,6 +1,6 @@
 #include <inet/arpa/inet.h>
 
-extern int __inet_aton (__const char *__cp, struct in_addr *__inp);
+extern int __inet_aton (const char *__cp, struct in_addr *__inp);
 libc_hidden_proto (__inet_aton)
 
 libc_hidden_proto (inet_aton)
diff --git a/include/assert.h b/include/assert.h
index 4b022342ef..573eb404ec 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -3,14 +3,14 @@
 /* This prints an "Assertion failed" message and aborts.
    In installed assert.h this is only conditionally declared,
    so it has to be repeated here.  */
-extern void __assert_fail (__const char *__assertion, __const char *__file,
-			   unsigned int __line, __const char *__function)
+extern void __assert_fail (const char *__assertion, const char *__file,
+			   unsigned int __line, const char *__function)
      __THROW __attribute__ ((__noreturn__));
 
 /* Likewise, but prints the error text for ERRNUM.  */
-extern void __assert_perror_fail (int __errnum, __const char *__file,
+extern void __assert_perror_fail (int __errnum, const char *__file,
 				  unsigned int __line,
-				  __const char *__function)
+				  const char *__function)
      __THROW __attribute__ ((__noreturn__));
 
 /* The real implementation of the two functions above.  */
diff --git a/include/dirent.h b/include/dirent.h
index 7dbf622bbb..28bf432301 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -12,8 +12,8 @@ struct scandir_cancel_struct
 };
 
 /* Now define the internal interfaces.  */
-extern DIR *__opendir (__const char *__name);
-extern DIR *__opendirat (int dfd, __const char *__name) internal_function;
+extern DIR *__opendir (const char *__name);
+extern DIR *__opendirat (int dfd, const char *__name) internal_function;
 extern DIR *__fdopendir (int __fd);
 extern int __closedir (DIR *__dirp);
 extern struct dirent *__readdir (DIR *__dirp);
@@ -22,11 +22,11 @@ extern int __readdir_r (DIR *__dirp, struct dirent *__entry,
 			struct dirent **__result);
 extern int __readdir64_r (DIR *__dirp, struct dirent64 *__entry,
 			  struct dirent64 **__result);
-extern int __scandir64 (__const char * __dir,
+extern int __scandir64 (const char * __dir,
 			struct dirent64 *** __namelist,
-			int (*__selector) (__const struct dirent64 *),
-			int (*__cmp) (__const struct dirent64 **,
-				      __const struct dirent64 **));
+			int (*__selector) (const struct dirent64 *),
+			int (*__cmp) (const struct dirent64 **,
+				      const struct dirent64 **));
 extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
      internal_function;
 extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 9e76d35600..ae9c886087 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -32,8 +32,8 @@ extern char **__libc_argv attribute_hidden;
 
 #define __libc_dlopen(name) \
   __libc_dlopen_mode (name, RTLD_LAZY | __RTLD_DLOPEN)
-extern void *__libc_dlopen_mode  (__const char *__name, int __mode);
-extern void *__libc_dlsym   (void *__map, __const char *__name);
+extern void *__libc_dlopen_mode  (const char *__name, int __mode);
+extern void *__libc_dlsym   (void *__map, const char *__name);
 extern int   __libc_dlclose (void *__map);
 libc_hidden_proto (__libc_dlopen_mode)
 libc_hidden_proto (__libc_dlsym)
diff --git a/include/execinfo.h b/include/execinfo.h
index 840a0818cb..c929821e8c 100644
--- a/include/execinfo.h
+++ b/include/execinfo.h
@@ -4,9 +4,9 @@
 extern int __backtrace (void **__array, int __size);
 libc_hidden_proto (__backtrace)
 
-extern char **__backtrace_symbols (void *__const *__array, int __size);
+extern char **__backtrace_symbols (void *const *__array, int __size);
 
-extern void __backtrace_symbols_fd (void *__const *__array, int __size,
+extern void __backtrace_symbols_fd (void *const *__array, int __size,
 				    int __fd);
 libc_hidden_proto (__backtrace_symbols_fd)
 
diff --git a/include/fcntl.h b/include/fcntl.h
index d5e5ddff02..7afbd1c74c 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -2,7 +2,7 @@
 #include <io/fcntl.h>
 
 /* Now define the internal interfaces.  */
-extern int __open64 (__const char *__file, int __oflag, ...);
+extern int __open64 (const char *__file, int __oflag, ...);
 libc_hidden_proto (__open64)
 extern int __libc_open64 (const char *file, int oflag, ...);
 extern int __libc_open (const char *file, int oflag, ...);
@@ -13,21 +13,21 @@ extern int __libc_fcntl (int fd, int cmd, ...);
 extern int __fcntl_nocancel (int fd, int cmd, ...) attribute_hidden;
 libc_hidden_proto (__libc_fcntl)
 #endif
-extern int __open (__const char *__file, int __oflag, ...);
+extern int __open (const char *__file, int __oflag, ...);
 libc_hidden_proto (__open)
 extern int __fcntl (int __fd, int __cmd, ...);
 libc_hidden_proto (__fcntl)
-extern int __openat (int __fd, __const char *__file, int __oflag, ...)
+extern int __openat (int __fd, const char *__file, int __oflag, ...)
   __nonnull ((2));
 libc_hidden_proto (__openat)
-extern int __openat64 (int __fd, __const char *__file, int __oflag, ...)
+extern int __openat64 (int __fd, const char *__file, int __oflag, ...)
   __nonnull ((2));
 libc_hidden_proto (__openat64)
 
-extern int __open_2 (__const char *__path, int __oflag);
-extern int __open64_2 (__const char *__path, int __oflag);
-extern int __openat_2 (int __fd, __const char *__path, int __oflag);
-extern int __openat64_2 (int __fd, __const char *__path, int __oflag);
+extern int __open_2 (const char *__path, int __oflag);
+extern int __open64_2 (const char *__path, int __oflag);
+extern int __openat_2 (int __fd, const char *__path, int __oflag);
+extern int __openat64_2 (int __fd, const char *__path, int __oflag);
 
 
 /* Helper functions for the various *at functions.  For Linux.  */
diff --git a/include/fenv.h b/include/fenv.h
index 3605f8150e..59d4c3f63c 100644
--- a/include/fenv.h
+++ b/include/fenv.h
@@ -7,10 +7,10 @@ extern int __feclearexcept (int __excepts);
 extern int __fegetexcept (void);
 extern int __fegetexceptflag (fexcept_t *__flagp, int __excepts);
 extern int __feraiseexcept (int __excepts);
-extern int __fesetexceptflag (__const fexcept_t *__flagp, int __excepts);
+extern int __fesetexceptflag (const fexcept_t *__flagp, int __excepts);
 extern int __fegetenv (fenv_t *__envp);
-extern int __fesetenv (__const fenv_t *__envp);
-extern int __feupdateenv (__const fenv_t *__envp);
+extern int __fesetenv (const fenv_t *__envp);
+extern int __feupdateenv (const fenv_t *__envp);
 
 libm_hidden_proto (feraiseexcept)
 libm_hidden_proto (fegetenv)
diff --git a/include/glob.h b/include/glob.h
index 821568e1fe..a0c05977f7 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -7,9 +7,9 @@ libc_hidden_proto (globfree)
 libc_hidden_proto (globfree64)
 
 /* Now define the internal interfaces.  */
-extern int __glob_pattern_p (__const char *__pattern, int __quote);
-extern int __glob64 (__const char *__pattern, int __flags,
-		     int (*__errfunc) (__const char *, int),
+extern int __glob_pattern_p (const char *__pattern, int __quote);
+extern int __glob64 (const char *__pattern, int __flags,
+		     int (*__errfunc) (const char *, int),
 		     glob64_t *__pglob);
 
 #endif
diff --git a/include/grp.h b/include/grp.h
index 5ed9c972f0..9fa71eac75 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -22,10 +22,10 @@ extern int __old_getgrgid_r (__gid_t __gid, struct group *__resultbuf,
 			     struct group **__result);
 
 /* Search for an entry with a matching group name.  */
-extern int __getgrnam_r (__const char *__name, struct group *__resultbuf,
+extern int __getgrnam_r (const char *__name, struct group *__resultbuf,
 			 char *__buffer, size_t __buflen,
 			 struct group **__result);
-extern int __old_getgrnam_r (__const char *__name, struct group *__resultbuf,
+extern int __old_getgrnam_r (const char *__name, struct group *__resultbuf,
 			     char *__buffer, size_t __buflen,
 			     struct group **__result);
 
@@ -39,16 +39,16 @@ libc_hidden_proto (_nss_files_parse_grent)
 extern enum nss_status _nss_ ## service ## _setgrent (int);		   \
 extern enum nss_status _nss_ ## service ## _endgrent (void);		   \
 extern enum nss_status _nss_ ## service ## _getgrgid_r			   \
-                       (gid_t gid, struct group *grp, char *buffer,	   \
+		       (gid_t gid, struct group *grp, char *buffer,	   \
 			size_t buflen, int *errnop);			   \
 extern enum nss_status _nss_ ## service ## _getgrnam_r			   \
-                       (const char *name, struct group *grp,		   \
+		       (const char *name, struct group *grp,		   \
 			char *buffer, size_t buflen, int *errnop);	   \
 extern enum nss_status _nss_ ## service ##_getgrent_r			   \
-                       (struct group *result, char *buffer, size_t buflen, \
+		       (struct group *result, char *buffer, size_t buflen, \
 			int *errnop);					   \
 extern enum nss_status _nss_ ## service ##_initgroups_dyn		   \
-                       (const char *user, gid_t group, long int *start,	   \
+		       (const char *user, gid_t group, long int *start,	   \
 			long int *size, gid_t **groupsp, long int limit,   \
 			int *errnop);
 
diff --git a/include/libintl.h b/include/libintl.h
index 8875c9444f..d15a6c0a05 100644
--- a/include/libintl.h
+++ b/include/libintl.h
@@ -3,43 +3,43 @@
 #include <locale.h>
 
 /* Now define the internal interfaces.  */
-extern char *__gettext (__const char *__msgid)
+extern char *__gettext (const char *__msgid)
      __attribute_format_arg__ (1);
-extern char *__dgettext (__const char *__domainname,
-			 __const char *__msgid)
+extern char *__dgettext (const char *__domainname,
+			 const char *__msgid)
      __attribute_format_arg__ (2);
-extern char *__dcgettext (__const char *__domainname,
-			  __const char *__msgid, int __category)
+extern char *__dcgettext (const char *__domainname,
+			  const char *__msgid, int __category)
      __attribute_format_arg__ (2);
 libc_hidden_proto (__dcgettext)
-extern char *__dcgettext_internal (__const char *__domainname,
-				   __const char *__msgid, int __category)
+extern char *__dcgettext_internal (const char *__domainname,
+				   const char *__msgid, int __category)
      __attribute_format_arg__ (2)
      attribute_hidden;
 
-extern char *__ngettext (__const char *__msgid1, __const char *__msgid2,
+extern char *__ngettext (const char *__msgid1, const char *__msgid2,
 			 unsigned long int __n)
      __attribute_format_arg__ (1) __attribute_format_arg__ (2);
-extern char *__dngettext (__const char *__domainname,
-			  __const char *__msgid1, __const char *__msgid2,
+extern char *__dngettext (const char *__domainname,
+			  const char *__msgid1, const char *__msgid2,
 			  unsigned long int __n)
      __attribute_format_arg__ (2) __attribute_format_arg__ (3);
-extern char *__dcngettext (__const char *__domainname,
-			   __const char *__msgid1, __const char *__msgid2,
+extern char *__dcngettext (const char *__domainname,
+			   const char *__msgid1, const char *__msgid2,
 			   unsigned long int __n, int __category)
      __attribute_format_arg__ (2) __attribute_format_arg__ (3);
-extern char *__dcngettext_internal (__const char *__domainname,
-				    __const char *__msgid1,
-				    __const char *__msgid2,
+extern char *__dcngettext_internal (const char *__domainname,
+				    const char *__msgid1,
+				    const char *__msgid2,
 				    unsigned long int __n, int __category)
      __attribute_format_arg__ (2) __attribute_format_arg__ (3)
      attribute_hidden;
 
-extern char *__textdomain (__const char *__domainname);
-extern char *__bindtextdomain (__const char *__domainname,
-			       __const char *__dirname);
-extern char *__bind_textdomain_codeset (__const char *__domainname,
-					__const char *__codeset);
+extern char *__textdomain (const char *__domainname);
+extern char *__bindtextdomain (const char *__domainname,
+			       const char *__dirname);
+extern char *__bind_textdomain_codeset (const char *__domainname,
+					const char *__codeset);
 
 extern const char _libc_intl_domainname[];
 libc_hidden_proto (_libc_intl_domainname)
diff --git a/include/mntent.h b/include/mntent.h
index 421f1df5de..3a75f0ddfd 100644
--- a/include/mntent.h
+++ b/include/mntent.h
@@ -2,8 +2,8 @@
 #include <misc/mntent.h>
 
 /* Now define the internal interfaces.  */
-extern FILE *__setmntent (__const char *__file, __const char *__mode);
-extern FILE *__setmntent_internal (__const char *__file, __const char *__mode);
+extern FILE *__setmntent (const char *__file, const char *__mode);
+extern FILE *__setmntent_internal (const char *__file, const char *__mode);
 extern struct mntent *__getmntent_r (FILE *__stream,
 				     struct mntent *__result,
 				     char *__buffer, int __bufsize);
@@ -11,11 +11,10 @@ extern struct mntent *__getmntent_r_internal (FILE *__stream,
 					      struct mntent *__result,
 					      char *__buffer, int __bufsize)
      attribute_hidden;
-extern int __addmntent (FILE *__stream, __const struct mntent *__mnt);
+extern int __addmntent (FILE *__stream