Blame SOURCES/glibc-rh1505492-prototypes-17.patch

00db10
commit 80d9be8122d1fe181d2476b5dad9f4ce37204958
00db10
Author: Joseph Myers <joseph@codesourcery.com>
00db10
Date:   Tue Oct 20 21:27:22 2015 +0000
00db10
00db10
    Convert miscellaneous function definitions to prototype style.
00db10
    
00db10
    This patch converts various miscellaneous functions definitions in
00db10
    glibc, found with grep and not covered by my previous scripted
00db10
    conversions, from old-style K&R to prototype-style.  These changes
00db10
    were made manually.  This is not necessarily exhaustive as formatting
00db10
    variants may have prevented my grep from finding some such
00db10
    definitions.
00db10
    
00db10
    Regarding the changes to files from GMP, they may originally have been
00db10
    omitted when removing __STDC__ conditionals because of the files
00db10
    coming from another package, but (a) GMP no longer has __STDC__
00db10
    conditionals there anyway and (b) we don't try to keep these files
00db10
    verbatim in sync with GMP (and there are licensing differences), so
00db10
    making the change to them in glibc seems reasonable.
00db10
    
00db10
    Tested for x86_64 and x86 (testsuite - this patch affects files
00db10
    containing assertions).
00db10
    
00db10
            * debug/fortify_fail.c (__fortify_fail): Convert to
00db10
            prototype-style function definition.  Use internal_function.
00db10
            * libio/genops.c (save_for_backup): Convert to prototype-style
00db10
            function definition.
00db10
            * libio/wgenops.c (save_for_wbackup): Likewise.
00db10
            * login/grantpt.c (grantpt): Likewise.
00db10
            * login/ptsname.c (ptsname): Likewise.
00db10
            (__ptsname_r): Likewise.
00db10
            * login/unlockpt.c (unlockpt): Likewise.
00db10
            * mach/msgserver.c (__mach_msg_server): Likewise.
00db10
            * misc/efgcvt.c (__APPEND (FUNC_PREFIX, fcvt)): Likewise.
00db10
            (__APPEND (FUNC_PREFIX, ecvt)): Likewise.
00db10
            (__APPEND (FUNC_PREFIX, gcvt)): Likewise.
00db10
            * misc/efgcvt_r.c (__APPEND (FUNC_PREFIX, fcvt_r)): Likewise.
00db10
            (__APPEND (FUNC_PREFIX, ecvt_r)): Likewise.
00db10
            * nptl/cleanup_compat.c (_pthread_cleanup_push): Likewise.
00db10
            * nptl/cleanup_defer_compat.c (_pthread_cleanup_push_defer):
00db10
            Likewise.
00db10
            * nptl/libc_pthread_init.c (__libc_pthread_init): Likewise.  Use
00db10
            internal_function.
00db10
            * nptl/pthread_atfork.c (__pthread_atfork): Convert to
00db10
            prototype-style function definition.
00db10
            * nptl/pthread_create.c (__pthread_create_2_1): Likewise.
00db10
            [SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)]
00db10
            (__pthread_create_2_0): Likewise.
00db10
            * nptl/pthread_key_create.c (__pthread_key_create): Likewise.
00db10
            * nptl/register-atfork.c (__register_atfork): Likewise.
00db10
            * posix/glob.c (glob): Likewise.
00db10
            * posix/regcomp.c (re_comp): Likewise.
00db10
            * posix/regexec.c (re_exec): Likewise.
00db10
            * stdlib/add_n.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/cmp.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/divmod_1.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/divrem.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/lshift.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/mod_1.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/mul.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/mul_n.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/rshift.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * stdlib/strtod.c (INTERNAL (STRTOF)): Convert to prototype-style
00db10
            function definition.
00db10
            (STRTOF): Likewise.
00db10
            * stdlib/strtod_l.c (__STRTOF): Likewise.
00db10
            * stdlib/strtol.c (INTERNAL (strtol)): Likewise.
00db10
            * stdlib/strtol_l.c (INTERNAL (__strtol_l)): Likewise.
00db10
            (__strtol_l): Likewise.
00db10
            * stdlib/sub_n.c [__STDC__]: Make code unconditional.
00db10
            [!__STDC__]: Remove conditional code.
00db10
            * string/memrchr.c (MEMRCHR): Convert to prototype-style function
00db10
            definition.
00db10
            * string/strcasecmp.c (LOCALE_PARAM_DECL): Remove macro.
00db10
            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
00db10
            type.
00db10
            (__strcasecmp): Convert to prototype-style function definition.
00db10
            * string/strncase.c (LOCALE_PARAM_DECL): Remove macro.
00db10
            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
00db10
            type.
00db10
            (__strncasecmp): Convert to prototype-style function definition.
00db10
            * sunrpc/pm_getport.c (__libc_rpc_getport): Likewise.
00db10
            * sunrpc/xdr.c (xdr_union): Likewise.
00db10
            * sunrpc/xdr_array.c (xdr_array): Likewise.
00db10
            * sunrpc/xdr_ref.c (xdr_reference): Likewise.
00db10
            * sysdeps/m68k/m680x0/fpu/s_atan.c (__CONCATX(__,FUNC)): Likewise.
00db10
            * sysdeps/m68k/m680x0/fpu/s_isinf.c (__CONCATX(__,FUNC)):
00db10
            Likewise.
00db10
            * sysdeps/m68k/m680x0/fpu/s_scalbn.c (__CONCATX(__scalbn,suffix):
00db10
            Likewise.
00db10
            * sysdeps/m68k/m680x0/fpu/s_sincos.c (CONCATX(__,FUNC)): Likewise.
00db10
            * sysdeps/unix/sysv/linux/i386/scandir64.c (__old_scandir64):
00db10
            Likewise.
00db10
            * time/strftime_l.c (LOCALE_PARAM_DECL): Remove macro.
00db10
            (LOCALE_PARAM_PROTO): Likewise.
00db10
            [_LIBC && USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include
00db10
            argument type.
00db10
            (ut_argument_spec): Remove macro.
00db10
            (ut_argument_spec_iso): Rename to ut_argument_spec.
00db10
            (memcpy_lowcase): Use LOCALE_PARAM in declaration.  Convert to
00db10
            prototype-style function definition.
00db10
            (memcpy_uppcase): Likewise.
00db10
            (__strftime_internal): Likewise.
00db10
            (my_strftime): Likewise.
00db10
            * time/strptime_l.c (LOCALE_PARAM_PROTO): Remove macro.
00db10
            (LOCALE_PARAM_DECL): Likewise.
00db10
            [_LIBC] (LOCALE_PARAM): Include argument type.
00db10
            (__strptime_internal): Convert to prototype-style function
00db10
            definition.
00db10
            (strptime): Likewise.
00db10
            * wcsmbs/wcscasecmp.c (LOCALE_PARAM_DECL): Remove macro.
00db10
            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
00db10
            type.
00db10
            (__wcscasecmp): Convert to prototype-style function definition.
00db10
            * wcsmbs/wcsncase.c (LOCALE_PARAM_DECL): Remove macro.
00db10
            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
00db10
            type.
00db10
            (__wcsncasecmp): Convert to prototype-style function definition.
00db10
00db10
Conflicts:
00db10
	nptl/libc_pthread_init.c
00db10
	  (Applied to nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c.)
00db10
	nptl/register-atfork.c
00db10
	  (Applied to nptl/sysdeps/unix/sysv/linux/register-atfork.c.)
00db10
00db10
diff --git a/debug/fortify_fail.c b/debug/fortify_fail.c
00db10
index c5621ea6b5806603..d76ab3718e7814e4 100644
00db10
--- a/debug/fortify_fail.c
00db10
+++ b/debug/fortify_fail.c
00db10
@@ -22,9 +22,8 @@
00db10
 extern char **__libc_argv attribute_hidden;
00db10
 
00db10
 void
00db10
-__attribute__ ((noreturn))
00db10
-__fortify_fail (msg)
00db10
-     const char *msg;
00db10
+__attribute__ ((noreturn)) internal_function
00db10
+__fortify_fail (const char *msg)
00db10
 {
00db10
   /* The loop is added only to keep gcc happy.  */
00db10
   while (1)
00db10
diff --git a/libio/genops.c b/libio/genops.c
00db10
index 09a9c2eacf1fcaea..1362fd15a88130d8 100644
00db10
--- a/libio/genops.c
00db10
+++ b/libio/genops.c
00db10
@@ -244,9 +244,7 @@ static int
00db10
 #ifdef _LIBC
00db10
 internal_function
00db10
 #endif
00db10
-save_for_backup (fp, end_p)
00db10
-     _IO_FILE *fp;
00db10
-     char *end_p;
00db10
+save_for_backup (_IO_FILE *fp, char *end_p)
00db10
 {
00db10
   /* Append [_IO_read_base..end_p] to backup area. */
00db10
   _IO_ssize_t least_mark = _IO_least_marker (fp, end_p);
00db10
diff --git a/libio/wgenops.c b/libio/wgenops.c
00db10
index 3f34bbc92d8746be..7ec7ae0c0c2c8976 100644
00db10
--- a/libio/wgenops.c
00db10
+++ b/libio/wgenops.c
00db10
@@ -468,9 +468,7 @@ static int
00db10
 #ifdef _LIBC
00db10
 internal_function
00db10
 #endif
00db10
-save_for_wbackup (fp, end_p)
00db10
-     _IO_FILE *fp;
00db10
-     wchar_t *end_p;
00db10
+save_for_wbackup (_IO_FILE *fp, wchar_t *end_p)
00db10
 {
00db10
   /* Append [_IO_read_base..end_p] to backup area. */
00db10
   _IO_ssize_t least_mark = _IO_least_wmarker (fp, end_p);
00db10
diff --git a/login/grantpt.c b/login/grantpt.c
00db10
index fd7ee6c0bcf2f6b9..62d48b3c489b004f 100644
00db10
--- a/login/grantpt.c
00db10
+++ b/login/grantpt.c
00db10
@@ -23,8 +23,7 @@
00db10
    with the slave to the calling process, and set its group and
00db10
    mode appropriately.  Note that this is an unprivileged operation. */
00db10
 int
00db10
-grantpt (fd)
00db10
-     int fd __attribute__ ((unused));
00db10
+grantpt (int fd __attribute__ ((unused)))
00db10
 {
00db10
   __set_errno (ENOSYS);
00db10
   return -1;
00db10
diff --git a/login/ptsname.c b/login/ptsname.c
00db10
index d22ec4136257e1e1..5fe85a938558a0eb 100644
00db10
--- a/login/ptsname.c
00db10
+++ b/login/ptsname.c
00db10
@@ -24,18 +24,16 @@
00db10
    of the associated slave. */
00db10
 
00db10
 char *
00db10
-ptsname (fd)
00db10
-     int fd __attribute__ ((unused));
00db10
+ptsname (int fd __attribute__ ((unused)))
00db10
 {
00db10
   __set_errno (ENOSYS);
00db10
   return NULL;
00db10
 }
00db10
 
00db10
 int
00db10
-__ptsname_r (fd, buf, len)
00db10
-     int fd __attribute__ ((unused));
00db10
-     char *buf __attribute__ ((unused));
00db10
-     size_t len __attribute__ ((unused));
00db10
+__ptsname_r (int fd __attribute__ ((unused)),
00db10
+	     char *buf __attribute__ ((unused)),
00db10
+	     size_t len __attribute__ ((unused)))
00db10
 {
00db10
   __set_errno (ENOSYS);
00db10
   return ENOSYS;
00db10
diff --git a/login/unlockpt.c b/login/unlockpt.c
00db10
index f00d88f9c1a5d8c4..14057d0fcdd4809c 100644
00db10
--- a/login/unlockpt.c
00db10
+++ b/login/unlockpt.c
00db10
@@ -23,8 +23,7 @@
00db10
    the slave can be opened.  This is to avoid a race between opening the
00db10
    master and calling grantpt() to take possession of the slave. */
00db10
 int
00db10
-unlockpt (fd)
00db10
-     int fd __attribute__ ((unused));
00db10
+unlockpt (int fd __attribute__ ((unused)))
00db10
 {
00db10
   __set_errno (ENOSYS);
00db10
   return -1;
00db10
diff --git a/mach/msgserver.c b/mach/msgserver.c
00db10
index b087e7263511b554..d1d90cdee476b2fc 100644
00db10
--- a/mach/msgserver.c
00db10
+++ b/mach/msgserver.c
00db10
@@ -187,10 +187,10 @@ __mach_msg_server_timeout (boolean_t (*demux) (mach_msg_header_t *request,
00db10
 weak_alias (__mach_msg_server_timeout, mach_msg_server_timeout)
00db10
 
00db10
 mach_msg_return_t
00db10
-__mach_msg_server (demux, max_size, rcv_name)
00db10
-     boolean_t (*demux) (mach_msg_header_t *in, mach_msg_header_t *out);
00db10
-     mach_msg_size_t max_size;
00db10
-     mach_port_t rcv_name;
00db10
+__mach_msg_server (boolean_t (*demux) (mach_msg_header_t *in,
00db10
+				       mach_msg_header_t *out),
00db10
+		   mach_msg_size_t max_size,
00db10
+		   mach_port_t rcv_name)
00db10
 {
00db10
   return __mach_msg_server_timeout (demux, max_size, rcv_name,
00db10
 				    MACH_MSG_OPTION_NONE,
00db10
diff --git a/misc/efgcvt.c b/misc/efgcvt.c
00db10
index d7d15a1846ce1be4..e1304592dc8f36a9 100644
00db10
--- a/misc/efgcvt.c
00db10
+++ b/misc/efgcvt.c
00db10
@@ -65,9 +65,8 @@ static char ECVT_BUFFER[MAXDIG];
00db10
 libc_freeres_ptr (static char *FCVT_BUFPTR);
00db10
 
00db10
 char *
00db10
-__APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)
00db10
-     FLOAT_TYPE value;
00db10
-     int ndigit, *decpt, *sign;
00db10
+__APPEND (FUNC_PREFIX, fcvt) (FLOAT_TYPE value, int ndigit, int *decpt,
00db10
+			      int *sign)
00db10
 {
00db10
   if (FCVT_BUFPTR == NULL)
00db10
     {
00db10
@@ -88,9 +87,8 @@ __APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)
00db10
 
00db10
 
00db10
 char *
00db10
-__APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)
00db10
-     FLOAT_TYPE value;
00db10
-     int ndigit, *decpt, *sign;
00db10
+__APPEND (FUNC_PREFIX, ecvt) (FLOAT_TYPE value, int ndigit, int *decpt,
00db10
+			      int *sign)
00db10
 {
00db10
   (void) __APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign,
00db10
 					 ECVT_BUFFER, MAXDIG);
00db10
@@ -99,10 +97,7 @@ __APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)
00db10
 }
00db10
 
00db10
 char *
00db10
-__APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf)
00db10
-     FLOAT_TYPE value;
00db10
-     int ndigit;
00db10
-     char *buf;
00db10
+__APPEND (FUNC_PREFIX, gcvt) (FLOAT_TYPE value, int ndigit, char *buf)
00db10
 {
00db10
   sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);
00db10
   return buf;
00db10
diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c
00db10
index e9f32d673132279d..4cd040fadc008399 100644
00db10
--- a/misc/efgcvt_r.c
00db10
+++ b/misc/efgcvt_r.c
00db10
@@ -72,11 +72,8 @@
00db10
 
00db10
 
00db10
 int
00db10
-__APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len)
00db10
-     FLOAT_TYPE value;
00db10
-     int ndigit, *decpt, *sign;
00db10
-     char *buf;
00db10
-     size_t len;
00db10
+__APPEND (FUNC_PREFIX, fcvt_r) (FLOAT_TYPE value, int ndigit, int *decpt,
00db10
+				int *sign, char *buf, size_t len)
00db10
 {
00db10
   ssize_t n;
00db10
   ssize_t i;
00db10
@@ -170,11 +167,8 @@ __APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len)
00db10
 }
00db10
 
00db10
 int
00db10
-__APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len)
00db10
-     FLOAT_TYPE value;
00db10
-     int ndigit, *decpt, *sign;
00db10
-     char *buf;
00db10
-     size_t len;
00db10
+__APPEND (FUNC_PREFIX, ecvt_r) (FLOAT_TYPE value, int ndigit, int *decpt,
00db10
+				int *sign, char *buf, size_t len)
00db10
 {
00db10
   int exponent = 0;
00db10
 
00db10
diff --git a/nptl/cleanup_compat.c b/nptl/cleanup_compat.c
00db10
index 67ff5965dd45de61..ba36268f8af78085 100644
00db10
--- a/nptl/cleanup_compat.c
00db10
+++ b/nptl/cleanup_compat.c
00db10
@@ -21,10 +21,8 @@
00db10
 
00db10
 
00db10
 void
00db10
-_pthread_cleanup_push (buffer, routine, arg)
00db10
-     struct _pthread_cleanup_buffer *buffer;
00db10
-     void (*routine) (void *);
00db10
-     void *arg;
00db10
+_pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,
00db10
+		       void (*routine) (void *), void *arg)
00db10
 {
00db10
   struct pthread *self = THREAD_SELF;
00db10
 
00db10
diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c
00db10
index e15723611c71d55a..96db28a26be0f7d4 100644
00db10
--- a/nptl/cleanup_defer_compat.c
00db10
+++ b/nptl/cleanup_defer_compat.c
00db10
@@ -20,10 +20,8 @@
00db10
 
00db10
 
00db10
 void
00db10
-_pthread_cleanup_push_defer (buffer, routine, arg)
00db10
-     struct _pthread_cleanup_buffer *buffer;
00db10
-     void (*routine) (void *);
00db10
-     void *arg;
00db10
+_pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
00db10
+			     void (*routine) (void *), void *arg)
00db10
 {
00db10
   struct pthread *self = THREAD_SELF;
00db10
 
00db10
diff --git a/nptl/pthread_atfork.c b/nptl/pthread_atfork.c
00db10
index 7da2fd65d227931a..749f417c308c16cc 100644
00db10
--- a/nptl/pthread_atfork.c
00db10
+++ b/nptl/pthread_atfork.c
00db10
@@ -48,10 +48,8 @@ int
00db10
 /* Don't mark the compatibility function as hidden.  */
00db10
 attribute_hidden
00db10
 #endif
00db10
-__pthread_atfork (prepare, parent, child)
00db10
-     void (*prepare) (void);
00db10
-     void (*parent) (void);
00db10
-     void (*child) (void);
00db10
+__pthread_atfork (void (*prepare) (void), void (*parent) (void),
00db10
+		  void (*child) (void))
00db10
 {
00db10
   return __register_atfork (prepare, parent, child,
00db10
 			    &__dso_handle == NULL ? NULL : __dso_handle);
00db10
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
00db10
index 987469ba58e7bffa..7cd0003e57f5e759 100644
00db10
--- a/nptl/pthread_create.c
00db10
+++ b/nptl/pthread_create.c
00db10
@@ -432,11 +432,8 @@ start_thread (void *arg)
00db10
 
00db10
 
00db10
 int
00db10
-__pthread_create_2_1 (newthread, attr, start_routine, arg)
00db10
-     pthread_t *newthread;
00db10
-     const pthread_attr_t *attr;
00db10
-     void *(*start_routine) (void *);
00db10
-     void *arg;
00db10
+__pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr,
00db10
+		      void *(*start_routine) (void *), void *arg)
00db10
 {
00db10
   STACK_VARIABLES;
00db10
 
00db10
@@ -560,11 +557,8 @@ versioned_symbol (libpthread, __pthread_create_2_1, pthread_create, GLIBC_2_1);
00db10
 
00db10
 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
00db10
 int
00db10
-__pthread_create_2_0 (newthread, attr, start_routine, arg)
00db10
-     pthread_t *newthread;
00db10
-     const pthread_attr_t *attr;
00db10
-     void *(*start_routine) (void *);
00db10
-     void *arg;
00db10
+__pthread_create_2_0 (pthread_t *newthread, const pthread_attr_t *attr,
00db10
+		      void *(*start_routine) (void *), void *arg)
00db10
 {
00db10
   /* The ATTR attribute is not really of type `pthread_attr_t *'.  It has
00db10
      the old size and access to the new members might crash the program.
00db10
diff --git a/nptl/pthread_key_create.c b/nptl/pthread_key_create.c
00db10
index 96e21ce6d6674b34..2654e6cc8f73fa24 100644
00db10
--- a/nptl/pthread_key_create.c
00db10
+++ b/nptl/pthread_key_create.c
00db10
@@ -22,9 +22,7 @@
00db10
 
00db10
 
00db10
 int
00db10
-__pthread_key_create (key, destr)
00db10
-     pthread_key_t *key;
00db10
-     void (*destr) (void *);
00db10
+__pthread_key_create (pthread_key_t *key, void (*destr) (void *))
00db10
 {
00db10
   /* Find a slot in __pthread_kyes which is unused.  */
00db10
   for (size_t cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt)
00db10
diff --git a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c
00db10
index adf0819f59c9d1f1..49bd2b47fe2d41cc 100644
00db10
--- a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c
00db10
+++ b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c
00db10
@@ -35,10 +35,9 @@ extern int __libc_multiple_threads attribute_hidden;
00db10
 
00db10
 int *
00db10
 #endif
00db10
-__libc_pthread_init (ptr, reclaim, functions)
00db10
-     unsigned long int *ptr;
00db10
-     void (*reclaim) (void);
00db10
-     const struct pthread_functions *functions;
00db10
+internal_function
00db10
+__libc_pthread_init (unsigned long int *ptr, void (*reclaim) (void),
00db10
+		     const struct pthread_functions *functions)
00db10
 {
00db10
   /* Remember the pointer to the generation counter in libpthread.  */
00db10
   __fork_generation_pointer = ptr;
00db10
diff --git a/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
00db10
index 8b5557d89288d9b3..54b950f71c984ee2 100644
00db10
--- a/nptl/sysdeps/unix/sysv/linux/register-atfork.c
00db10
+++ b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
00db10
@@ -78,11 +78,8 @@ fork_handler_alloc (void)
00db10
 
00db10
 
00db10
 int
00db10
-__register_atfork (prepare, parent, child, dso_handle)
00db10
-     void (*prepare) (void);
00db10
-     void (*parent) (void);
00db10
-     void (*child) (void);
00db10
-     void *dso_handle;
00db10
+__register_atfork (void (*prepare) (void), void (*parent) (void),
00db10
+		   void (*child) (void), void *dso_handle)
00db10
 {
00db10
   /* Get the lock to not conflict with other allocations.  */
00db10
   lll_lock (__fork_lock, LLL_PRIVATE);
00db10
diff --git a/posix/glob.c b/posix/glob.c
00db10
index e3d6fe0f15f7d9ce..01a1f2cba3d1d3da 100644
00db10
--- a/posix/glob.c
00db10
+++ b/posix/glob.c
00db10
@@ -251,11 +251,8 @@ int
00db10
 #ifdef GLOB_ATTRIBUTE
00db10
 GLOB_ATTRIBUTE
00db10
 #endif
00db10
-glob (pattern, flags, errfunc, pglob)
00db10
-     const char *pattern;
00db10
-     int flags;
00db10
-     int (*errfunc) (const char *, int);
00db10
-     glob_t *pglob;
00db10
+glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
00db10
+      glob_t *pglob)
00db10
 {
00db10
   const char *filename;
00db10
   char *dirname = NULL;
00db10
diff --git a/posix/regcomp.c b/posix/regcomp.c
00db10
index 80359e58db504ed6..049522f6efbee0c2 100644
00db10
--- a/posix/regcomp.c
00db10
+++ b/posix/regcomp.c
00db10
@@ -656,8 +656,7 @@ char *
00db10
    regcomp/regexec above without link errors.  */
00db10
 weak_function
00db10
 # endif
00db10
-re_comp (s)
00db10
-     const char *s;
00db10
+re_comp (const char *s)
00db10
 {
00db10
   reg_errcode_t ret;
00db10
   char *fastmap;
00db10
diff --git a/posix/regexec.c b/posix/regexec.c
00db10
index f315149af88ac6bb..6ca865dc9a7d44d5 100644
00db10
--- a/posix/regexec.c
00db10
+++ b/posix/regexec.c
00db10
@@ -586,8 +586,7 @@ int
00db10
 # ifdef _LIBC
00db10
 weak_function
00db10
 # endif
00db10
-re_exec (s)
00db10
-     const char *s;
00db10
+re_exec (const char *s)
00db10
 {
00db10
   return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
00db10
 }
00db10
diff --git a/stdlib/add_n.c b/stdlib/add_n.c
00db10
index afb8e09306d7ecc7..fc5a6dbf71c70c7d 100644
00db10
--- a/stdlib/add_n.c
00db10
+++ b/stdlib/add_n.c
00db10
@@ -22,15 +22,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
 #include "gmp-impl.h"
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_add_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr, mp_size_t size)
00db10
-#else
00db10
-mpn_add_n (res_ptr, s1_ptr, s2_ptr, size)
00db10
-     register mp_ptr res_ptr;
00db10
-     register mp_srcptr s1_ptr;
00db10
-     register mp_srcptr s2_ptr;
00db10
-     mp_size_t size;
00db10
-#endif
00db10
 {
00db10
   register mp_limb_t x, y, cy;
00db10
   register mp_size_t j;
00db10
diff --git a/stdlib/cmp.c b/stdlib/cmp.c
00db10
index 003b9aa236cf9d6d..90a41bbf990e14ae 100644
00db10
--- a/stdlib/cmp.c
00db10
+++ b/stdlib/cmp.c
00db10
@@ -27,14 +27,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
    Return 1 if OP1 > OP2, 0 if they are equal, and -1 if OP1 < OP2.  */
00db10
 
00db10
 int
00db10
-#if __STDC__
00db10
 mpn_cmp (mp_srcptr op1_ptr, mp_srcptr op2_ptr, mp_size_t size)
00db10
-#else
00db10
-mpn_cmp (op1_ptr, op2_ptr, size)
00db10
-     mp_srcptr op1_ptr;
00db10
-     mp_srcptr op2_ptr;
00db10
-     mp_size_t size;
00db10
-#endif
00db10
 {
00db10
   mp_size_t i;
00db10
   mp_limb_t op1_word, op2_word;
00db10
diff --git a/stdlib/divmod_1.c b/stdlib/divmod_1.c
00db10
index 4e6966bc913927a3..275dceff87094b8a 100644
00db10
--- a/stdlib/divmod_1.c
00db10
+++ b/stdlib/divmod_1.c
00db10
@@ -40,17 +40,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
    here (not udiv_qrnnd).  */
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_divmod_1 (mp_ptr quot_ptr,
00db10
 	      mp_srcptr dividend_ptr, mp_size_t dividend_size,
00db10
 	      mp_limb_t divisor_limb)
00db10
-#else
00db10
-mpn_divmod_1 (quot_ptr, dividend_ptr, dividend_size, divisor_limb)
00db10
-     mp_ptr quot_ptr;
00db10
-     mp_srcptr dividend_ptr;
00db10
-     mp_size_t dividend_size;
00db10
-     mp_limb_t divisor_limb;
00db10
-#endif
00db10
 {
00db10
   mp_size_t i;
00db10
   mp_limb_t n1, n0, r;
00db10
diff --git a/stdlib/divrem.c b/stdlib/divrem.c
00db10
index c0abb4d9fbcfc0cf..0c5b2da7df0f6880 100644
00db10
--- a/stdlib/divrem.c
00db10
+++ b/stdlib/divrem.c
00db10
@@ -40,19 +40,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
    3. NSIZE >= DSIZE, even if QEXTRA_LIMBS is non-zero.  */
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_divrem (mp_ptr qp, mp_size_t qextra_limbs,
00db10
 	    mp_ptr np, mp_size_t nsize,
00db10
 	    mp_srcptr dp, mp_size_t dsize)
00db10
-#else
00db10
-mpn_divrem (qp, qextra_limbs, np, nsize, dp, dsize)
00db10
-     mp_ptr qp;
00db10
-     mp_size_t qextra_limbs;
00db10
-     mp_ptr np;
00db10
-     mp_size_t nsize;
00db10
-     mp_srcptr dp;
00db10
-     mp_size_t dsize;
00db10
-#endif
00db10
 {
00db10
   mp_limb_t most_significant_q_limb = 0;
00db10
 
00db10
diff --git a/stdlib/lshift.c b/stdlib/lshift.c
00db10
index deb264177a5710f8..d2608e06e9113c4a 100644
00db10
--- a/stdlib/lshift.c
00db10
+++ b/stdlib/lshift.c
00db10
@@ -31,17 +31,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
 */
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_lshift (register mp_ptr wp,
00db10
 	    register mp_srcptr up, mp_size_t usize,
00db10
 	    register unsigned int cnt)
00db10
-#else
00db10
-mpn_lshift (wp, up, usize, cnt)
00db10
-     register mp_ptr wp;
00db10
-     register mp_srcptr up;
00db10
-     mp_size_t usize;
00db10
-     register unsigned int cnt;
00db10
-#endif
00db10
 {
00db10
   register mp_limb_t high_limb, low_limb;
00db10
   register unsigned sh_1, sh_2;
00db10
diff --git a/stdlib/mod_1.c b/stdlib/mod_1.c
00db10
index d325a931adef007c..72d8ff8110e2c9e2 100644
00db10
--- a/stdlib/mod_1.c
00db10
+++ b/stdlib/mod_1.c
00db10
@@ -37,15 +37,8 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
    here (not udiv_qrnnd).  */
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_mod_1 (mp_srcptr dividend_ptr, mp_size_t dividend_size,
00db10
 	   mp_limb_t divisor_limb)
00db10
-#else
00db10
-mpn_mod_1 (dividend_ptr, dividend_size, divisor_limb)
00db10
-     mp_srcptr dividend_ptr;
00db10
-     mp_size_t dividend_size;
00db10
-     mp_limb_t divisor_limb;
00db10
-#endif
00db10
 {
00db10
   mp_size_t i;
00db10
   mp_limb_t n1, n0, r;
00db10
diff --git a/stdlib/mul.c b/stdlib/mul.c
00db10
index cab3e2b134080f08..1cb9d73ef96a4559 100644
00db10
--- a/stdlib/mul.c
00db10
+++ b/stdlib/mul.c
00db10
@@ -42,18 +42,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
 #endif
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_mul (mp_ptr prodp,
00db10
 	 mp_srcptr up, mp_size_t usize,
00db10
 	 mp_srcptr vp, mp_size_t vsize)
00db10
-#else
00db10
-mpn_mul (prodp, up, usize, vp, vsize)
00db10
-     mp_ptr prodp;
00db10
-     mp_srcptr up;
00db10
-     mp_size_t usize;
00db10
-     mp_srcptr vp;
00db10
-     mp_size_t vsize;
00db10
-#endif
00db10
 {
00db10
   mp_ptr prod_endp = prodp + usize + vsize - 1;
00db10
   mp_limb_t cy;
00db10
diff --git a/stdlib/mul_n.c b/stdlib/mul_n.c
00db10
index 36876c2473e46295..ac2ab42dc887389e 100644
00db10
--- a/stdlib/mul_n.c
00db10
+++ b/stdlib/mul_n.c
00db10
@@ -49,15 +49,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
    algorithm below.  */
00db10
 
00db10
 void
00db10
-#if __STDC__
00db10
 impn_mul_n_basecase (mp_ptr prodp, mp_srcptr up, mp_srcptr vp, mp_size_t size)
00db10
-#else
00db10
-impn_mul_n_basecase (prodp, up, vp, size)
00db10
-     mp_ptr prodp;
00db10
-     mp_srcptr up;
00db10
-     mp_srcptr vp;
00db10
-     mp_size_t size;
00db10
-#endif
00db10
 {
00db10
   mp_size_t i;
00db10
   mp_limb_t cy_limb;
00db10
@@ -100,17 +92,8 @@ impn_mul_n_basecase (prodp, up, vp, size)
00db10
 }
00db10
 
00db10
 void
00db10
-#if __STDC__
00db10
 impn_mul_n (mp_ptr prodp,
00db10
 	     mp_srcptr up, mp_srcptr vp, mp_size_t size, mp_ptr tspace)
00db10
-#else
00db10
-impn_mul_n (prodp, up, vp, size, tspace)
00db10
-     mp_ptr prodp;
00db10
-     mp_srcptr up;
00db10
-     mp_srcptr vp;
00db10
-     mp_size_t size;
00db10
-     mp_ptr tspace;
00db10
-#endif
00db10
 {
00db10
   if ((size & 1) != 0)
00db10
     {
00db10
@@ -219,14 +202,7 @@ impn_mul_n (prodp, up, vp, size, tspace)
00db10
 }
00db10
 
00db10
 void
00db10
-#if __STDC__
00db10
 impn_sqr_n_basecase (mp_ptr prodp, mp_srcptr up, mp_size_t size)
00db10
-#else
00db10
-impn_sqr_n_basecase (prodp, up, size)
00db10
-     mp_ptr prodp;
00db10
-     mp_srcptr up;
00db10
-     mp_size_t size;
00db10
-#endif
00db10
 {
00db10
   mp_size_t i;
00db10
   mp_limb_t cy_limb;
00db10
@@ -269,16 +245,8 @@ impn_sqr_n_basecase (prodp, up, size)
00db10
 }
00db10
 
00db10
 void
00db10
-#if __STDC__
00db10
 impn_sqr_n (mp_ptr prodp,
00db10
 	     mp_srcptr up, mp_size_t size, mp_ptr tspace)
00db10
-#else
00db10
-impn_sqr_n (prodp, up, size, tspace)
00db10
-     mp_ptr prodp;
00db10
-     mp_srcptr up;
00db10
-     mp_size_t size;
00db10
-     mp_ptr tspace;
00db10
-#endif
00db10
 {
00db10
   if ((size & 1) != 0)
00db10
     {
00db10
@@ -358,15 +326,7 @@ impn_sqr_n (prodp, up, size, tspace)
00db10
 
00db10
 /* This should be made into an inline function in gmp.h.  */
00db10
 void
00db10
-#if __STDC__
00db10
 mpn_mul_n (mp_ptr prodp, mp_srcptr up, mp_srcptr vp, mp_size_t size)
00db10
-#else
00db10
-mpn_mul_n (prodp, up, vp, size)
00db10
-     mp_ptr prodp;
00db10
-     mp_srcptr up;
00db10
-     mp_srcptr vp;
00db10
-     mp_size_t size;
00db10
-#endif
00db10
 {
00db10
   TMP_DECL (marker);
00db10
   TMP_MARK (marker);
00db10
diff --git a/stdlib/rshift.c b/stdlib/rshift.c
00db10
index 13a12be35c673971..96562d474fca72a7 100644
00db10
--- a/stdlib/rshift.c
00db10
+++ b/stdlib/rshift.c
00db10
@@ -31,17 +31,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
 */
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_rshift (register mp_ptr wp,
00db10
 	    register mp_srcptr up, mp_size_t usize,
00db10
 	    register unsigned int cnt)
00db10
-#else
00db10
-mpn_rshift (wp, up, usize, cnt)
00db10
-     register mp_ptr wp;
00db10
-     register mp_srcptr up;
00db10
-     mp_size_t usize;
00db10
-     register unsigned int cnt;
00db10
-#endif
00db10
 {
00db10
   register mp_limb_t high_limb, low_limb;
00db10
   register unsigned sh_1, sh_2;
00db10
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
00db10
index 570780cdecbffde0..657d95de82169358 100644
00db10
--- a/stdlib/strtod.c
00db10
+++ b/stdlib/strtod.c
00db10
@@ -46,10 +46,7 @@
00db10
 
00db10
 
00db10
 FLOAT
00db10
-INTERNAL (STRTOF) (nptr, endptr, group)
00db10
-     const STRING_TYPE *nptr;
00db10
-     STRING_TYPE **endptr;
00db10
-     int group;
00db10
+INTERNAL (STRTOF) (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group)
00db10
 {
00db10
   return INTERNAL(STRTOF_L) (nptr, endptr, group, _NL_CURRENT_LOCALE);
00db10
 }
00db10
@@ -62,9 +59,7 @@ FLOAT
00db10
 #ifdef weak_function
00db10
 weak_function
00db10
 #endif
00db10
-STRTOF (nptr, endptr)
00db10
-     const STRING_TYPE *nptr;
00db10
-     STRING_TYPE **endptr;
00db10
+STRTOF (const STRING_TYPE *nptr, STRING_TYPE **endptr)
00db10
 {
00db10
   return INTERNAL(STRTOF_L) (nptr, endptr, 0, _NL_CURRENT_LOCALE);
00db10
 }
00db10
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
00db10
index e5b30d443106ee91..bfbe9b4d96222823 100644
00db10
--- a/stdlib/strtod_l.c
00db10
+++ b/stdlib/strtod_l.c
00db10
@@ -1738,10 +1738,7 @@ FLOAT
00db10
 #ifdef weak_function
00db10
 weak_function
00db10
 #endif
00db10
-__STRTOF (nptr, endptr, loc)
00db10
-     const STRING_TYPE *nptr;
00db10
-     STRING_TYPE **endptr;
00db10
-     __locale_t loc;
00db10
+__STRTOF (const STRING_TYPE *nptr, STRING_TYPE **endptr, __locale_t loc)
00db10
 {
00db10
   return ____STRTOF_INTERNAL (nptr, endptr, 0, loc);
00db10
 }
00db10
diff --git a/stdlib/strtol.c b/stdlib/strtol.c
00db10
index 67d758c57973b5d5..68b81ef557a6274c 100644
00db10
--- a/stdlib/strtol.c
00db10
+++ b/stdlib/strtol.c
00db10
@@ -89,11 +89,8 @@ extern INT INTERNAL (__strtol_l) (const STRING_TYPE *, STRING_TYPE **, int,
00db10
 
00db10
 
00db10
 INT
00db10
-INTERNAL (strtol) (nptr, endptr, base, group)
00db10
-     const STRING_TYPE *nptr;
00db10
-     STRING_TYPE **endptr;
00db10
-     int base;
00db10
-     int group;
00db10
+INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
00db10
+		   int base, int group)
00db10
 {
00db10
   return INTERNAL (__strtol_l) (nptr, endptr, base, group, _NL_CURRENT_LOCALE);
00db10
 }
00db10
diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c
00db10
index 8174d22f060c2149..3e686acec1484118 100644
00db10
--- a/stdlib/strtol_l.c
00db10
+++ b/stdlib/strtol_l.c
00db10
@@ -222,12 +222,8 @@ extern const unsigned char __strtol_ull_rem_tab[] attribute_hidden;
00db10
    one converted is stored in *ENDPTR.  */
00db10
 
00db10
 INT
00db10
-INTERNAL (__strtol_l) (nptr, endptr, base, group, loc)
00db10
-     const STRING_TYPE *nptr;
00db10
-     STRING_TYPE **endptr;
00db10
-     int base;
00db10
-     int group;
00db10
-     __locale_t loc;
00db10
+INTERNAL (__strtol_l) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
00db10
+		       int base, int group, __locale_t loc)
00db10
 {
00db10
   int negative;
00db10
   unsigned LONG int cutoff;
00db10
@@ -546,11 +542,8 @@ INT
00db10
 #ifdef weak_function
00db10
 weak_function
00db10
 #endif
00db10
-__strtol_l (nptr, endptr, base, loc)
00db10
-     const STRING_TYPE *nptr;
00db10
-     STRING_TYPE **endptr;
00db10
-     int base;
00db10
-     __locale_t loc;
00db10
+__strtol_l (const STRING_TYPE *nptr, STRING_TYPE **endptr,
00db10
+	    int base, __locale_t loc)
00db10
 {
00db10
   return INTERNAL (__strtol_l) (nptr, endptr, base, 0, loc);
00db10
 }
00db10
diff --git a/stdlib/sub_n.c b/stdlib/sub_n.c
00db10
index 7e8ca2354554d062..db6928d82df8499d 100644
00db10
--- a/stdlib/sub_n.c
00db10
+++ b/stdlib/sub_n.c
00db10
@@ -22,15 +22,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
00db10
 #include "gmp-impl.h"
00db10
 
00db10
 mp_limb_t
00db10
-#if __STDC__
00db10
 mpn_sub_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr, mp_size_t size)
00db10
-#else
00db10
-mpn_sub_n (res_ptr, s1_ptr, s2_ptr, size)
00db10
-     register mp_ptr res_ptr;
00db10
-     register mp_srcptr s1_ptr;
00db10
-     register mp_srcptr s2_ptr;
00db10
-     mp_size_t size;
00db10
-#endif
00db10
 {
00db10
   register mp_limb_t x, y, cy;
00db10
   register mp_size_t j;
00db10
diff --git a/string/memrchr.c b/string/memrchr.c
00db10
index 2826f1305626fb7c..79d19aa18ff5bd3e 100644
00db10
--- a/string/memrchr.c
00db10
+++ b/string/memrchr.c
00db10
@@ -61,10 +61,7 @@ __memrchr
00db10
 #else
00db10
 MEMRCHR
00db10
 #endif
00db10
-     (s, c_in, n)
00db10
-     const __ptr_t s;
00db10
-     int c_in;
00db10
-     size_t n;
00db10
+     (const __ptr_t s, int c_in, size_t n)
00db10
 {
00db10
   const unsigned char *char_ptr;
00db10
   const unsigned long int *longword_ptr;
00db10
diff --git a/string/strcasecmp.c b/string/strcasecmp.c
00db10
index e7a3c4481b27e954..73581256fc13cbb8 100644
00db10
--- a/string/strcasecmp.c
00db10
+++ b/string/strcasecmp.c
00db10
@@ -35,21 +35,16 @@
00db10
 #endif
00db10
 
00db10
 #ifdef USE_IN_EXTENDED_LOCALE_MODEL
00db10
-# define LOCALE_PARAM , loc
00db10
-# define LOCALE_PARAM_DECL __locale_t loc;
00db10
+# define LOCALE_PARAM , __locale_t loc
00db10
 #else
00db10
 # define LOCALE_PARAM
00db10
-# define LOCALE_PARAM_DECL
00db10
 #endif
00db10
 
00db10
 /* Compare S1 and S2, ignoring case, returning less than, equal to or
00db10
    greater than zero if S1 is lexicographically less than,
00db10
    equal to or greater than S2.  */
00db10
 int
00db10
-__strcasecmp (s1, s2 LOCALE_PARAM)
00db10
-     const char *s1;
00db10
-     const char *s2;
00db10
-     LOCALE_PARAM_DECL
00db10
+__strcasecmp (const char *s1, const char *s2 LOCALE_PARAM)
00db10
 {
00db10
 #if defined _LIBC && !defined USE_IN_EXTENDED_LOCALE_MODEL
00db10
   __locale_t loc = _NL_CURRENT_LOCALE;
00db10
diff --git a/string/strncase.c b/string/strncase.c
00db10
index 02fd51fd40a8ee94..fbd85f3a2329850d 100644
00db10
--- a/string/strncase.c
00db10
+++ b/string/strncase.c
00db10
@@ -36,11 +36,9 @@
00db10
 #endif
00db10
 
00db10
 #ifdef USE_IN_EXTENDED_LOCALE_MODEL
00db10
-# define LOCALE_PARAM , loc
00db10
-# define LOCALE_PARAM_DECL __locale_t loc;
00db10
+# define LOCALE_PARAM , __locale_t loc
00db10
 #else
00db10
 # define LOCALE_PARAM
00db10
-# define LOCALE_PARAM_DECL
00db10
 #endif
00db10
 
00db10
 /* Compare no more than N characters of S1 and S2,
00db10
@@ -48,11 +46,7 @@
00db10
    greater than zero if S1 is lexicographically less
00db10
    than, equal to or greater than S2.  */
00db10
 int
00db10
-__strncasecmp (s1, s2, n LOCALE_PARAM)
00db10
-     const char *s1;
00db10
-     const char *s2;
00db10
-     size_t n;
00db10
-     LOCALE_PARAM_DECL
00db10
+__strncasecmp (const char *s1, const char *s2, size_t n LOCALE_PARAM)
00db10
 {
00db10
 #if defined _LIBC && !defined USE_IN_EXTENDED_LOCALE_MODEL
00db10
   __locale_t loc = _NL_CURRENT_LOCALE;
00db10
diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
00db10
index 5c43acc0609d7377..f1fd462e181f7a8b 100644
00db10
--- a/sunrpc/pm_getport.c
00db10
+++ b/sunrpc/pm_getport.c
00db10
@@ -82,14 +82,9 @@ __get_socket (struct sockaddr_in *saddr)
00db10
  */
00db10
 u_short
00db10
 internal_function
00db10
-__libc_rpc_getport (address, program, version, protocol, timeout_sec,
00db10
-		    tottimeout_sec)
00db10
-     struct sockaddr_in *address;
00db10
-     u_long program;
00db10
-     u_long version;
00db10
-     u_int protocol;
00db10
-     time_t timeout_sec;
00db10
-     time_t tottimeout_sec;
00db10
+__libc_rpc_getport (struct sockaddr_in *address, u_long program,
00db10
+		    u_long version, u_int protocol, time_t timeout_sec,
00db10
+		    time_t tottimeout_sec)
00db10
 {
00db10
   const struct timeval timeout = {timeout_sec, 0};
00db10
   const struct timeval tottimeout = {tottimeout_sec, 0};
00db10
diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
00db10
index 9f1f7d417521044d..32dfa0aa1ab1e76a 100644
00db10
--- a/sunrpc/xdr.c
00db10
+++ b/sunrpc/xdr.c
00db10
@@ -674,12 +674,15 @@ libc_hidden_nolink_sunrpc (xdr_netobj, GLIBC_2_0)
00db10
  * If there is no specific or default routine an error is returned.
00db10
  */
00db10
 bool_t
00db10
-xdr_union (xdrs, dscmp, unp, choices, dfault)
00db10
-     XDR *xdrs;
00db10
-     enum_t *dscmp;		/* enum to decide which arm to work on */
00db10
-     char *unp;			/* the union itself */
00db10
-     const struct xdr_discrim *choices;	/* [value, xdr proc] for each arm */
00db10
-     xdrproc_t dfault;		/* default xdr routine */
00db10
+xdr_union (XDR *xdrs,
00db10
+	   /* enum to decide which arm to work on */
00db10
+	   enum_t *dscmp,
00db10
+	   /* the union itself */
00db10
+	   char *unp,
00db10
+	   /* [value, xdr proc] for each arm */
00db10
+	   const struct xdr_discrim *choices,
00db10
+	   /* default xdr routine */
00db10
+	   xdrproc_t dfault)
00db10
 {
00db10
   enum_t dscm;
00db10
 
00db10
diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
00db10
index fd9d1fb42f744844..99a1d5d24520572f 100644
00db10
--- a/sunrpc/xdr_array.c
00db10
+++ b/sunrpc/xdr_array.c
00db10
@@ -53,13 +53,17 @@
00db10
  * xdr procedure to call to handle each element of the array.
00db10
  */
00db10
 bool_t
00db10
-xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
00db10
-     XDR *xdrs;
00db10
-     caddr_t *addrp;		/* array pointer */
00db10
-     u_int *sizep;		/* number of elements */
00db10
-     u_int maxsize;		/* max numberof elements */
00db10
-     u_int elsize;		/* size in bytes of each element */
00db10
-     xdrproc_t elproc;		/* xdr routine to handle each element */
00db10
+xdr_array (XDR *xdrs,
00db10
+	   /* array pointer */
00db10
+	   caddr_t *addrp,
00db10
+	   /* number of elements */
00db10
+	   u_int *sizep,
00db10
+	   /* max numberof elements */
00db10
+	   u_int maxsize,
00db10
+	   /* size in bytes of each element */
00db10
+	   u_int elsize,
00db10
+	   /* xdr routine to handle each element */
00db10
+	   xdrproc_t elproc)
00db10
 {
00db10
   u_int i;
00db10
   caddr_t target = *addrp;
00db10
diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
00db10
index a7d9264ed6be6fe2..2b7ebc8e11ca4dab 100644
00db10
--- a/sunrpc/xdr_ref.c
00db10
+++ b/sunrpc/xdr_ref.c
00db10
@@ -54,11 +54,13 @@
00db10
  * proc is the routine to handle the referenced structure.
00db10
  */
00db10
 bool_t
00db10
-xdr_reference (xdrs, pp, size, proc)
00db10
-     XDR *xdrs;
00db10
-     caddr_t *pp;		/* the pointer to work on */
00db10
-     u_int size;		/* size of the object pointed to */
00db10
-     xdrproc_t proc;		/* xdr routine to handle the object */
00db10
+xdr_reference (XDR *xdrs,
00db10
+	       /* the pointer to work on */
00db10
+	       caddr_t *pp,
00db10
+	       /* size of the object pointed to */
00db10
+	       u_int size,
00db10
+	       /* xdr routine to handle the object */
00db10
+	       xdrproc_t proc)
00db10
 {
00db10
   caddr_t loc = *pp;
00db10
   bool_t stat;
00db10
diff --git a/sysdeps/m68k/m680x0/fpu/s_atan.c b/sysdeps/m68k/m680x0/fpu/s_atan.c
00db10
index c7bba83f30a4174d..acb6900d82d5c77d 100644
00db10
--- a/sysdeps/m68k/m680x0/fpu/s_atan.c
00db10
+++ b/sysdeps/m68k/m680x0/fpu/s_atan.c
00db10
@@ -27,8 +27,7 @@
00db10
 #define __CONCATX(a,b) __CONCAT(a,b)
00db10
 
00db10
 float_type
00db10
-__CONCATX(__,FUNC) (x)
00db10
-     float_type x;
00db10
+__CONCATX(__,FUNC) (float_type x)
00db10
 {
00db10
   return __m81_u(__CONCATX(__,FUNC))(x);
00db10
 }
00db10
diff --git a/sysdeps/m68k/m680x0/fpu/s_isinf.c b/sysdeps/m68k/m680x0/fpu/s_isinf.c
00db10
index 20872da536619d09..dfb9d99be8f8560c 100644
00db10
--- a/sysdeps/m68k/m680x0/fpu/s_isinf.c
00db10
+++ b/sysdeps/m68k/m680x0/fpu/s_isinf.c
00db10
@@ -27,8 +27,7 @@
00db10
 #define __CONCATX(a,b) __CONCAT(a,b)
00db10
 
00db10
 int
00db10
-__CONCATX(__,FUNC) (x)
00db10
-     float_type x;
00db10
+__CONCATX(__,FUNC) (float_type x)
00db10
 {
00db10
   return __m81_u(__CONCATX(__,FUNC))(x);
00db10
 }
00db10
diff --git a/sysdeps/m68k/m680x0/fpu/s_scalbn.c b/sysdeps/m68k/m680x0/fpu/s_scalbn.c
00db10
index ce1b92a22c2107df..8861f7a522cc00f4 100644
00db10
--- a/sysdeps/m68k/m680x0/fpu/s_scalbn.c
00db10
+++ b/sysdeps/m68k/m680x0/fpu/s_scalbn.c
00db10
@@ -39,9 +39,7 @@
00db10
 #define __CONCATX(a,b) __CONCAT(a,b)
00db10
 
00db10
 float_type
00db10
-__CONCATX(__scalbn,suffix) (x, exp)
00db10
-     float_type x;
00db10
-     int exp;
00db10
+__CONCATX(__scalbn,suffix) (float_type x, int exp)
00db10
 {
00db10
   return __m81_u(__CONCATX(__scalbn,suffix))(x, exp);
00db10
 }
00db10
diff --git a/sysdeps/m68k/m680x0/fpu/s_sincos.c b/sysdeps/m68k/m680x0/fpu/s_sincos.c
00db10
index f7a40a3704204240..d2eb192363d6c907 100644
00db10
--- a/sysdeps/m68k/m680x0/fpu/s_sincos.c
00db10
+++ b/sysdeps/m68k/m680x0/fpu/s_sincos.c
00db10
@@ -27,8 +27,7 @@
00db10
 #define CONCATX(a,b) __CONCAT(a,b)
00db10
 
00db10
 void
00db10
-CONCATX(__,FUNC) (x, sinx, cosx)
00db10
-     float_type x, *sinx, *cosx;
00db10
+CONCATX(__,FUNC) (float_type x, float_type *sinx, float_type *cosx)
00db10
 {
00db10
   __m81_u(CONCATX(__,FUNC))(x, sinx, cosx);
00db10
 }
00db10
diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c
00db10
index aca505a320b99473..485c84bee3e09aea 100644
00db10
--- a/sysdeps/unix/sysv/linux/i386/scandir64.c
00db10
+++ b/sysdeps/unix/sysv/linux/i386/scandir64.c
00db10
@@ -39,12 +39,10 @@ versioned_symbol (libc, __scandir64, scandir64, GLIBC_2_2);
00db10
 # include "olddirent.h"
00db10
 
00db10
 int
00db10
-__old_scandir64 (dir, namelist, select, cmp)
00db10
-     const char *dir;
00db10
-     struct __old_dirent64 ***namelist;
00db10
-     int (*select) (const struct __old_dirent64 *);
00db10
-     int (*cmp) (const struct __old_dirent64 **,
00db10
-		 const struct __old_dirent64 **);
00db10
+__old_scandir64 (const char *dir, struct __old_dirent64 ***namelist,
00db10
+		 int (*select) (const struct __old_dirent64 *),
00db10
+		 int (*cmp) (const struct __old_dirent64 **,
00db10
+			     const struct __old_dirent64 **))
00db10
 {
00db10
   DIR *dp = __opendir (dir);
00db10
   struct __old_dirent64 **v = NULL;
00db10
diff --git a/time/strftime_l.c b/time/strftime_l.c
00db10
index 0f6ac83d34d43755..a1fe2714d221f4f3 100644
00db10
--- a/time/strftime_l.c
00db10
+++ b/time/strftime_l.c
00db10
@@ -284,16 +284,12 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
00db10
 # undef _NL_CURRENT
00db10
 # define _NL_CURRENT(category, item) \
00db10
   (current->values[_NL_ITEM_INDEX (item)].string)
00db10
-# define LOCALE_PARAM , loc
00db10
+# define LOCALE_PARAM , __locale_t loc
00db10
 # define LOCALE_ARG , loc
00db10
-# define LOCALE_PARAM_DECL  __locale_t loc;
00db10
-# define LOCALE_PARAM_PROTO , __locale_t loc
00db10
 # define HELPER_LOCALE_ARG  , current
00db10
 #else
00db10
 # define LOCALE_PARAM
00db10
-# define LOCALE_PARAM_PROTO
00db10
 # define LOCALE_ARG
00db10
-# define LOCALE_PARAM_DECL
00db10
 # ifdef _LIBC
00db10
 #  define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME)
00db10
 # else
00db10
@@ -330,14 +326,10 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
00db10
 #define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9)
00db10
 
00db10
 static CHAR_T *memcpy_lowcase (CHAR_T *dest, const CHAR_T *src,
00db10
-			       size_t len LOCALE_PARAM_PROTO) __THROW;
00db10
+			       size_t len LOCALE_PARAM) __THROW;
00db10
 
00db10
 static CHAR_T *
00db10
-memcpy_lowcase (dest, src, len LOCALE_PARAM)
00db10
-     CHAR_T *dest;
00db10
-     const CHAR_T *src;
00db10
-     size_t len;
00db10
-     LOCALE_PARAM_DECL
00db10
+memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM)
00db10
 {
00db10
   while (len-- > 0)
00db10
     dest[len] = TOLOWER ((UCHAR_T) src[len], loc);
00db10
@@ -345,14 +337,10 @@ memcpy_lowcase (dest, src, len LOCALE_PARAM)
00db10
 }
00db10
 
00db10
 static CHAR_T *memcpy_uppcase (CHAR_T *dest, const CHAR_T *src,
00db10
-			       size_t len LOCALE_PARAM_PROTO) __THROW;
00db10
+			       size_t len LOCALE_PARAM) __THROW;
00db10
 
00db10
 static CHAR_T *
00db10
-memcpy_uppcase (dest, src, len LOCALE_PARAM)
00db10
-     CHAR_T *dest;
00db10
-     const CHAR_T *src;
00db10
-     size_t len;
00db10
-     LOCALE_PARAM_DECL
00db10
+memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM)
00db10
 {
00db10
   while (len-- > 0)
00db10
     dest[len] = TOUPPER ((UCHAR_T) src[len], loc);
00db10
@@ -429,8 +417,7 @@ static CHAR_T const month_name[][10] =
00db10
 #ifdef emacs
00db10
 # define my_strftime emacs_strftimeu
00db10
 # define ut_argument , ut
00db10
-# define ut_argument_spec int ut;
00db10
-# define ut_argument_spec_iso , int ut
00db10
+# define ut_argument_spec , int ut
00db10
 #else
00db10
 # ifdef COMPILE_WIDE
00db10
 #  define my_strftime wcsftime
00db10
@@ -441,15 +428,14 @@ static CHAR_T const month_name[][10] =
00db10
 # endif
00db10
 # define ut_argument
00db10
 # define ut_argument_spec
00db10
-# define ut_argument_spec_iso
00db10
 /* We don't have this information in general.  */
00db10
 # define ut 0
00db10
 #endif
00db10
 
00db10
 static size_t __strftime_internal (CHAR_T *, size_t, const CHAR_T *,
00db10
 				   const struct tm *, bool *
00db10
-				   ut_argument_spec_iso
00db10
-				   LOCALE_PARAM_PROTO) __THROW;
00db10
+				   ut_argument_spec
00db10
+				   LOCALE_PARAM) __THROW;
00db10
 
00db10
 /* Write information from TP into S according to the format
00db10
    string FORMAT, writing no more that MAXSIZE characters
00db10
@@ -459,13 +445,8 @@ static size_t __strftime_internal (CHAR_T *, size_t, const CHAR_T *,
00db10
    written, use NULL for S and (size_t) UINT_MAX for MAXSIZE.  */
00db10
 
00db10
 size_t
00db10
-my_strftime (s, maxsize, format, tp ut_argument LOCALE_PARAM)
00db10
-     CHAR_T *s;
00db10
-     size_t maxsize;
00db10
-     const CHAR_T *format;
00db10
-     const struct tm *tp;
00db10
-     ut_argument_spec
00db10
-     LOCALE_PARAM_DECL
00db10
+my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format,
00db10
+	     const struct tm *tp ut_argument_spec LOCALE_PARAM)
00db10
 {
00db10
 #if !defined _LIBC && HAVE_TZNAME && HAVE_TZSET
00db10
   /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime.
00db10
@@ -483,15 +464,9 @@ libc_hidden_def (my_strftime)
00db10
 #endif
00db10
 
00db10
 static size_t
00db10
-__strftime_internal (s, maxsize, format, tp, tzset_called ut_argument
00db10
-		     LOCALE_PARAM)
00db10
-      CHAR_T *s;
00db10
-      size_t maxsize;
00db10
-      const CHAR_T *format;
00db10
-      const struct tm *tp;
00db10
-      bool *tzset_called;
00db10
-      ut_argument_spec
00db10
-      LOCALE_PARAM_DECL
00db10
+__strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
00db10
+		     const struct tm *tp, bool *tzset_called
00db10
+		     ut_argument_spec LOCALE_PARAM)
00db10
 {
00db10
 #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
00db10
   struct __locale_data *const current = loc->__locales[LC_TIME];
00db10
diff --git a/time/strptime_l.c b/time/strptime_l.c
00db10
index cb2b8faa6d740748..7f1efa13374c5eb4 100644
00db10
--- a/time/strptime_l.c
00db10
+++ b/time/strptime_l.c
00db10
@@ -181,17 +181,13 @@ static const unsigned short int __mon_yday[2][13] =
00db10
 # undef _NL_CURRENT_WORD
00db10
 # define _NL_CURRENT_WORD(category, item) \
00db10
   (current->values[_NL_ITEM_INDEX (item)].word)
00db10
-# define LOCALE_PARAM , locale
00db10
+# define LOCALE_PARAM , __locale_t locale
00db10
 # define LOCALE_ARG , locale
00db10
-# define LOCALE_PARAM_PROTO , __locale_t locale
00db10
-# define LOCALE_PARAM_DECL __locale_t locale;
00db10
 # define HELPER_LOCALE_ARG , current
00db10
 # define ISSPACE(Ch) __isspace_l (Ch, locale)
00db10
 #else
00db10
 # define LOCALE_PARAM
00db10
 # define LOCALE_ARG
00db10
-# define LOCALE_PARAM_DECL
00db10
-# define LOCALE_PARAM_PROTO
00db10
 # define HELPER_LOCALE_ARG
00db10
 # define ISSPACE(Ch) isspace (Ch)
00db10
 #endif
00db10
@@ -239,12 +235,8 @@ internal_function
00db10
 #else
00db10
 static char *
00db10
 #endif
00db10
-__strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
00db10
-     const char *rp;
00db10
-     const char *fmt;
00db10
-     struct tm *tmp;
00db10
-     void *statep;
00db10
-     LOCALE_PARAM_DECL
00db10
+__strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
00db10
+		     void *statep LOCALE_PARAM)
00db10
 {
00db10
 #ifdef _LIBC
00db10
   struct __locale_data *const current = locale->__locales[LC_TIME];
00db10
@@ -1204,11 +1196,7 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
00db10
 
00db10
 
00db10
 char *
00db10
-strptime (buf, format, tm LOCALE_PARAM)
00db10
-     const char *buf;
00db10
-     const char *format;
00db10
-     struct tm *tm;
00db10
-     LOCALE_PARAM_DECL
00db10
+strptime (const char *buf, const char *format, struct tm *tm LOCALE_PARAM)
00db10
 {
00db10
   return __strptime_internal (buf, format, tm, NULL LOCALE_ARG);
00db10
 }
00db10
diff --git a/wcsmbs/wcscasecmp.c b/wcsmbs/wcscasecmp.c
00db10
index f970057f504999c8..4943bb5b9b410426 100644
00db10
--- a/wcsmbs/wcscasecmp.c
00db10
+++ b/wcsmbs/wcscasecmp.c
00db10
@@ -35,21 +35,16 @@
00db10
 #endif
00db10
 
00db10
 #ifdef USE_IN_EXTENDED_LOCALE_MODEL
00db10
-# define LOCALE_PARAM , loc
00db10
-# define LOCALE_PARAM_DECL __locale_t loc;
00db10
+# define LOCALE_PARAM , __locale_t loc
00db10
 #else
00db10
 # define LOCALE_PARAM
00db10
-# define LOCALE_PARAM_DECL
00db10
 #endif
00db10
 
00db10
 /* Compare S1 and S2, ignoring case, returning less than, equal to or
00db10
    greater than zero if S1 is lexicographically less than,
00db10
    equal to or greater than S2.  */
00db10
 int
00db10
-__wcscasecmp (s1, s2 LOCALE_PARAM)
00db10
-     const wchar_t *s1;
00db10
-     const wchar_t *s2;
00db10
-     LOCALE_PARAM_DECL
00db10
+__wcscasecmp (const wchar_t *s1, const wchar_t *s2 LOCALE_PARAM)
00db10
 {
00db10
   wint_t c1, c2;
00db10
 
00db10
diff --git a/wcsmbs/wcsncase.c b/wcsmbs/wcsncase.c
00db10
index 8b216b48184f793d..3e56ce5d25197a60 100644
00db10
--- a/wcsmbs/wcsncase.c
00db10
+++ b/wcsmbs/wcsncase.c
00db10
@@ -37,11 +37,9 @@
00db10
 #endif
00db10
 
00db10
 #ifdef USE_IN_EXTENDED_LOCALE_MODEL
00db10
-# define LOCALE_PARAM , loc
00db10
-# define LOCALE_PARAM_DECL __locale_t loc;
00db10
+# define LOCALE_PARAM , __locale_t loc
00db10
 #else
00db10
 # define LOCALE_PARAM
00db10
-# define LOCALE_PARAM_DECL
00db10
 #endif
00db10
 
00db10
 /* Compare no more than N wide characters of S1 and S2,
00db10
@@ -49,11 +47,7 @@
00db10
    greater than zero if S1 is lexicographically less
00db10
    than, equal to or greater than S2.  */
00db10
 int
00db10
-__wcsncasecmp (s1, s2, n LOCALE_PARAM)
00db10
-     const wchar_t *s1;
00db10
-     const wchar_t *s2;
00db10
-     size_t n;
00db10
-     LOCALE_PARAM_DECL
00db10
+__wcsncasecmp (const wchar_t *s1, const wchar_t *s2, size_t n LOCALE_PARAM)
00db10
 {
00db10
   wint_t c1, c2;
00db10