commit 80d9be8122d1fe181d2476b5dad9f4ce37204958

Author: Joseph Myers <joseph@codesourcery.com>

Date:   Tue Oct 20 21:27:22 2015 +0000

    Convert miscellaneous function definitions to prototype style.

    This patch converts various miscellaneous functions definitions in

    glibc, found with grep and not covered by my previous scripted

    conversions, from old-style K&R to prototype-style.  These changes

    were made manually.  This is not necessarily exhaustive as formatting

    variants may have prevented my grep from finding some such

    definitions.

    Regarding the changes to files from GMP, they may originally have been

    omitted when removing __STDC__ conditionals because of the files

    coming from another package, but (a) GMP no longer has __STDC__

    conditionals there anyway and (b) we don't try to keep these files

    verbatim in sync with GMP (and there are licensing differences), so

    making the change to them in glibc seems reasonable.

    Tested for x86_64 and x86 (testsuite - this patch affects files

    containing assertions).

            * debug/fortify_fail.c (__fortify_fail): Convert to

            prototype-style function definition.  Use internal_function.

            * libio/genops.c (save_for_backup): Convert to prototype-style

            function definition.

            * libio/wgenops.c (save_for_wbackup): Likewise.

            * login/grantpt.c (grantpt): Likewise.

            * login/ptsname.c (ptsname): Likewise.

            (__ptsname_r): Likewise.

            * login/unlockpt.c (unlockpt): Likewise.

            * mach/msgserver.c (__mach_msg_server): Likewise.

            * misc/efgcvt.c (__APPEND (FUNC_PREFIX, fcvt)): Likewise.

            (__APPEND (FUNC_PREFIX, ecvt)): Likewise.

            (__APPEND (FUNC_PREFIX, gcvt)): Likewise.

            * misc/efgcvt_r.c (__APPEND (FUNC_PREFIX, fcvt_r)): Likewise.

            (__APPEND (FUNC_PREFIX, ecvt_r)): Likewise.

            * nptl/cleanup_compat.c (_pthread_cleanup_push): Likewise.

            * nptl/cleanup_defer_compat.c (_pthread_cleanup_push_defer):

            Likewise.

            * nptl/libc_pthread_init.c (__libc_pthread_init): Likewise.  Use

            internal_function.

            * nptl/pthread_atfork.c (__pthread_atfork): Convert to

            prototype-style function definition.

            * nptl/pthread_create.c (__pthread_create_2_1): Likewise.

            [SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)]

            (__pthread_create_2_0): Likewise.

            * nptl/pthread_key_create.c (__pthread_key_create): Likewise.

            * nptl/register-atfork.c (__register_atfork): Likewise.

            * posix/glob.c (glob): Likewise.

            * posix/regcomp.c (re_comp): Likewise.

            * posix/regexec.c (re_exec): Likewise.

            * stdlib/add_n.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/cmp.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/divmod_1.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/divrem.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/lshift.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/mod_1.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/mul.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/mul_n.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/rshift.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * stdlib/strtod.c (INTERNAL (STRTOF)): Convert to prototype-style

            function definition.

            (STRTOF): Likewise.

            * stdlib/strtod_l.c (__STRTOF): Likewise.

            * stdlib/strtol.c (INTERNAL (strtol)): Likewise.

            * stdlib/strtol_l.c (INTERNAL (__strtol_l)): Likewise.

            (__strtol_l): Likewise.

            * stdlib/sub_n.c [__STDC__]: Make code unconditional.

            [!__STDC__]: Remove conditional code.

            * string/memrchr.c (MEMRCHR): Convert to prototype-style function

            definition.

            * string/strcasecmp.c (LOCALE_PARAM_DECL): Remove macro.

            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument

            type.

            (__strcasecmp): Convert to prototype-style function definition.

            * string/strncase.c (LOCALE_PARAM_DECL): Remove macro.

            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument

            type.

            (__strncasecmp): Convert to prototype-style function definition.

            * sunrpc/pm_getport.c (__libc_rpc_getport): Likewise.

            * sunrpc/xdr.c (xdr_union): Likewise.

            * sunrpc/xdr_array.c (xdr_array): Likewise.

            * sunrpc/xdr_ref.c (xdr_reference): Likewise.

            * sysdeps/m68k/m680x0/fpu/s_atan.c (__CONCATX(__,FUNC)): Likewise.

            * sysdeps/m68k/m680x0/fpu/s_isinf.c (__CONCATX(__,FUNC)):

            Likewise.

            * sysdeps/m68k/m680x0/fpu/s_scalbn.c (__CONCATX(__scalbn,suffix):

            Likewise.

            * sysdeps/m68k/m680x0/fpu/s_sincos.c (CONCATX(__,FUNC)): Likewise.

            * sysdeps/unix/sysv/linux/i386/scandir64.c (__old_scandir64):

            Likewise.

            * time/strftime_l.c (LOCALE_PARAM_DECL): Remove macro.

            (LOCALE_PARAM_PROTO): Likewise.

            [_LIBC && USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include

            argument type.

            (ut_argument_spec): Remove macro.

            (ut_argument_spec_iso): Rename to ut_argument_spec.

            (memcpy_lowcase): Use LOCALE_PARAM in declaration.  Convert to

            prototype-style function definition.

            (memcpy_uppcase): Likewise.

            (__strftime_internal): Likewise.

            (my_strftime): Likewise.

            * time/strptime_l.c (LOCALE_PARAM_PROTO): Remove macro.

            (LOCALE_PARAM_DECL): Likewise.

            [_LIBC] (LOCALE_PARAM): Include argument type.

            (__strptime_internal): Convert to prototype-style function

            definition.

            (strptime): Likewise.

            * wcsmbs/wcscasecmp.c (LOCALE_PARAM_DECL): Remove macro.

            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument

            type.

            (__wcscasecmp): Convert to prototype-style function definition.

            * wcsmbs/wcsncase.c (LOCALE_PARAM_DECL): Remove macro.

            [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument

            type.

            (__wcsncasecmp): Convert to prototype-style function definition.

Conflicts:

	nptl/libc_pthread_init.c

	  (Applied to nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c.)

	nptl/register-atfork.c

	  (Applied to nptl/sysdeps/unix/sysv/linux/register-atfork.c.)

diff --git a/debug/fortify_fail.c b/debug/fortify_fail.c

index c5621ea6b5806603..d76ab3718e7814e4 100644

--- a/debug/fortify_fail.c

+++ b/debug/fortify_fail.c

@@ -22,9 +22,8 @@

 extern char **__libc_argv attribute_hidden;

 void

-__attribute__ ((noreturn))

-__fortify_fail (msg)

-     const char *msg;

+__attribute__ ((noreturn)) internal_function

+__fortify_fail (const char *msg)

 {

   /* The loop is added only to keep gcc happy.  */

   while (1)

diff --git a/libio/genops.c b/libio/genops.c

index 09a9c2eacf1fcaea..1362fd15a88130d8 100644

--- a/libio/genops.c

+++ b/libio/genops.c

@@ -244,9 +244,7 @@ static int

 #ifdef _LIBC

 internal_function

 #endif

-save_for_backup (fp, end_p)

-     _IO_FILE *fp;

-     char *end_p;

+save_for_backup (_IO_FILE *fp, char *end_p)

 {

   /* Append [_IO_read_base..end_p] to backup area. */

   _IO_ssize_t least_mark = _IO_least_marker (fp, end_p);

diff --git a/libio/wgenops.c b/libio/wgenops.c

index 3f34bbc92d8746be..7ec7ae0c0c2c8976 100644

--- a/libio/wgenops.c

+++ b/libio/wgenops.c

@@ -468,9 +468,7 @@ static int

 #ifdef _LIBC

 internal_function

 #endif

-save_for_wbackup (fp, end_p)

-     _IO_FILE *fp;

-     wchar_t *end_p;

+save_for_wbackup (_IO_FILE *fp, wchar_t *end_p)

 {

   /* Append [_IO_read_base..end_p] to backup area. */

   _IO_ssize_t least_mark = _IO_least_wmarker (fp, end_p);

diff --git a/login/grantpt.c b/login/grantpt.c

index fd7ee6c0bcf2f6b9..62d48b3c489b004f 100644

--- a/login/grantpt.c

+++ b/login/grantpt.c

@@ -23,8 +23,7 @@

    with the slave to the calling process, and set its group and

    mode appropriately.  Note that this is an unprivileged operation. */

 int

-grantpt (fd)

-     int fd __attribute__ ((unused));

+grantpt (int fd __attribute__ ((unused)))

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/login/ptsname.c b/login/ptsname.c

index d22ec4136257e1e1..5fe85a938558a0eb 100644

--- a/login/ptsname.c

+++ b/login/ptsname.c

@@ -24,18 +24,16 @@

    of the associated slave. */

 char *

-ptsname (fd)

-     int fd __attribute__ ((unused));

+ptsname (int fd __attribute__ ((unused)))

 {

   __set_errno (ENOSYS);

   return NULL;

 }

 int

-__ptsname_r (fd, buf, len)

-     int fd __attribute__ ((unused));

-     char *buf __attribute__ ((unused));

-     size_t len __attribute__ ((unused));

+__ptsname_r (int fd __attribute__ ((unused)),

+	     char *buf __attribute__ ((unused)),

+	     size_t len __attribute__ ((unused)))

 {

   __set_errno (ENOSYS);

   return ENOSYS;

diff --git a/login/unlockpt.c b/login/unlockpt.c

index f00d88f9c1a5d8c4..14057d0fcdd4809c 100644

--- a/login/unlockpt.c

+++ b/login/unlockpt.c

@@ -23,8 +23,7 @@

    the slave can be opened.  This is to avoid a race between opening the

    master and calling grantpt() to take possession of the slave. */

 int

-unlockpt (fd)

-     int fd __attribute__ ((unused));

+unlockpt (int fd __attribute__ ((unused)))

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/mach/msgserver.c b/mach/msgserver.c

index b087e7263511b554..d1d90cdee476b2fc 100644

--- a/mach/msgserver.c

+++ b/mach/msgserver.c

@@ -187,10 +187,10 @@ __mach_msg_server_timeout (boolean_t (*demux) (mach_msg_header_t *request,

 weak_alias (__mach_msg_server_timeout, mach_msg_server_timeout)

 mach_msg_return_t

-__mach_msg_server (demux, max_size, rcv_name)

-     boolean_t (*demux) (mach_msg_header_t *in, mach_msg_header_t *out);

-     mach_msg_size_t max_size;

-     mach_port_t rcv_name;

+__mach_msg_server (boolean_t (*demux) (mach_msg_header_t *in,

+				       mach_msg_header_t *out),

+		   mach_msg_size_t max_size,

+		   mach_port_t rcv_name)

 {

   return __mach_msg_server_timeout (demux, max_size, rcv_name,

 				    MACH_MSG_OPTION_NONE,

diff --git a/misc/efgcvt.c b/misc/efgcvt.c

index d7d15a1846ce1be4..e1304592dc8f36a9 100644

--- a/misc/efgcvt.c

+++ b/misc/efgcvt.c

@@ -65,9 +65,8 @@ static char ECVT_BUFFER[MAXDIG];

 libc_freeres_ptr (static char *FCVT_BUFPTR);

 char *

-__APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)

-     FLOAT_TYPE value;

-     int ndigit, *decpt, *sign;

+__APPEND (FUNC_PREFIX, fcvt) (FLOAT_TYPE value, int ndigit, int *decpt,

+			      int *sign)

 {

   if (FCVT_BUFPTR == NULL)

     {

@@ -88,9 +87,8 @@ __APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)

 char *

-__APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)

-     FLOAT_TYPE value;

-     int ndigit, *decpt, *sign;

+__APPEND (FUNC_PREFIX, ecvt) (FLOAT_TYPE value, int ndigit, int *decpt,

+			      int *sign)

 {

   (void) __APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign,

 					 ECVT_BUFFER, MAXDIG);

@@ -99,10 +97,7 @@ __APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)

 }

 char *

-__APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf)

-     FLOAT_TYPE value;

-     int ndigit;

-     char *buf;

+__APPEND (FUNC_PREFIX, gcvt) (FLOAT_TYPE value, int ndigit, char *buf)

 {

   sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);

   return buf;

diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c

index e9f32d673132279d..4cd040fadc008399 100644

--- a/misc/efgcvt_r.c

+++ b/misc/efgcvt_r.c

@@ -72,11 +72,8 @@

 int

-__APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len)

-     FLOAT_TYPE value;

-     int ndigit, *decpt, *sign;

-     char *buf;

-     size_t len;

+__APPEND (FUNC_PREFIX, fcvt_r) (FLOAT_TYPE value, int ndigit, int *decpt,

+				int *sign, char *buf, size_t len)

 {

   ssize_t n;

   ssize_t i;

@@ -170,11 +167,8 @@ __APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len)

 }

 int

-__APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len)

-     FLOAT_TYPE value;

-     int ndigit, *decpt, *sign;

-     char *buf;

-     size_t len;

+__APPEND (FUNC_PREFIX, ecvt_r) (FLOAT_TYPE value, int ndigit, int *decpt,

+				int *sign, char *buf, size_t len)

 {

   int exponent = 0;

diff --git a/nptl/cleanup_compat.c b/nptl/cleanup_compat.c

index 67ff5965dd45de61..ba36268f8af78085 100644

--- a/nptl/cleanup_compat.c

+++ b/nptl/cleanup_compat.c

@@ -21,10 +21,8 @@

 void

-_pthread_cleanup_push (buffer, routine, arg)

-     struct _pthread_cleanup_buffer *buffer;

-     void (*routine) (void *);

-     void *arg;

+_pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,

+		       void (*routine) (void *), void *arg)

 {

   struct pthread *self = THREAD_SELF;

diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c

index e15723611c71d55a..96db28a26be0f7d4 100644

--- a/nptl/cleanup_defer_compat.c

+++ b/nptl/cleanup_defer_compat.c

@@ -20,10 +20,8 @@

 void

-_pthread_cleanup_push_defer (buffer, routine, arg)

-     struct _pthread_cleanup_buffer *buffer;

-     void (*routine) (void *);

-     void *arg;

+_pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,

+			     void (*routine) (void *), void *arg)

 {

   struct pthread *self = THREAD_SELF;

diff --git a/nptl/pthread_atfork.c b/nptl/pthread_atfork.c

index 7da2fd65d227931a..749f417c308c16cc 100644

--- a/nptl/pthread_atfork.c

+++ b/nptl/pthread_atfork.c

@@ -48,10 +48,8 @@ int

 /* Don't mark the compatibility function as hidden.  */

 attribute_hidden

 #endif

-__pthread_atfork (prepare, parent, child)

-     void (*prepare) (void);

-     void (*parent) (void);

-     void (*child) (void);

+__pthread_atfork (void (*prepare) (void), void (*parent) (void),

+		  void (*child) (void))

 {

   return __register_atfork (prepare, parent, child,

 			    &__dso_handle == NULL ? NULL : __dso_handle);

diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c

index 987469ba58e7bffa..7cd0003e57f5e759 100644

--- a/nptl/pthread_create.c

+++ b/nptl/pthread_create.c

@@ -432,11 +432,8 @@ start_thread (void *arg)

 int

-__pthread_create_2_1 (newthread, attr, start_routine, arg)

-     pthread_t *newthread;

-     const pthread_attr_t *attr;

-     void *(*start_routine) (void *);

-     void *arg;

+__pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr,

+		      void *(*start_routine) (void *), void *arg)

 {

   STACK_VARIABLES;

@@ -560,11 +557,8 @@ versioned_symbol (libpthread, __pthread_create_2_1, pthread_create, GLIBC_2_1);

 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)

 int

-__pthread_create_2_0 (newthread, attr, start_routine, arg)

-     pthread_t *newthread;

-     const pthread_attr_t *attr;

-     void *(*start_routine) (void *);

-     void *arg;

+__pthread_create_2_0 (pthread_t *newthread, const pthread_attr_t *attr,

+		      void *(*start_routine) (void *), void *arg)

 {

   /* The ATTR attribute is not really of type `pthread_attr_t *'.  It has

      the old size and access to the new members might crash the program.

diff --git a/nptl/pthread_key_create.c b/nptl/pthread_key_create.c

index 96e21ce6d6674b34..2654e6cc8f73fa24 100644

--- a/nptl/pthread_key_create.c

+++ b/nptl/pthread_key_create.c

@@ -22,9 +22,7 @@

 int

-__pthread_key_create (key, destr)

-     pthread_key_t *key;

-     void (*destr) (void *);

+__pthread_key_create (pthread_key_t *key, void (*destr) (void *))

 {

   /* Find a slot in __pthread_kyes which is unused.  */

   for (size_t cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt)

diff --git a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c

index adf0819f59c9d1f1..49bd2b47fe2d41cc 100644

--- a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c

+++ b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c

@@ -35,10 +35,9 @@ extern int __libc_multiple_threads attribute_hidden;

 int *

 #endif

-__libc_pthread_init (ptr, reclaim, functions)

-     unsigned long int *ptr;

-     void (*reclaim) (void);

-     const struct pthread_functions *functions;

+internal_function

+__libc_pthread_init (unsigned long int *ptr, void (*reclaim) (void),

+		     const struct pthread_functions *functions)

 {

   /* Remember the pointer to the generation counter in libpthread.  */

   __fork_generation_pointer = ptr;

diff --git a/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/nptl/sysdeps/unix/sysv/linux/register-atfork.c

index 8b5557d89288d9b3..54b950f71c984ee2 100644

--- a/nptl/sysdeps/unix/sysv/linux/register-atfork.c

+++ b/nptl/sysdeps/unix/sysv/linux/register-atfork.c

@@ -78,11 +78,8 @@ fork_handler_alloc (void)

 int

-__register_atfork (prepare, parent, child, dso_handle)

-     void (*prepare) (void);

-     void (*parent) (void);

-     void (*child) (void);

-     void *dso_handle;

+__register_atfork (void (*prepare) (void), void (*parent) (void),

+		   void (*child) (void), void *dso_handle)

 {

   /* Get the lock to not conflict with other allocations.  */

   lll_lock (__fork_lock, LLL_PRIVATE);

diff --git a/posix/glob.c b/posix/glob.c

index e3d6fe0f15f7d9ce..01a1f2cba3d1d3da 100644

--- a/posix/glob.c

+++ b/posix/glob.c

@@ -251,11 +251,8 @@ int

 #ifdef GLOB_ATTRIBUTE

 GLOB_ATTRIBUTE

 #endif

-glob (pattern, flags, errfunc, pglob)

-     const char *pattern;

-     int flags;

-     int (*errfunc) (const char *, int);

-     glob_t *pglob;

+glob (const char *pattern, int flags, int (*errfunc) (const char *, int),

+      glob_t *pglob)

 {

   const char *filename;

   char *dirname = NULL;

diff --git a/posix/regcomp.c b/posix/regcomp.c

index 80359e58db504ed6..049522f6efbee0c2 100644

--- a/posix/regcomp.c

+++ b/posix/regcomp.c

@@ -656,8 +656,7 @@ char *

    regcomp/regexec above without link errors.  */

 weak_function

 # endif

-re_comp (s)

-     const char *s;

+re_comp (const char *s)

 {

   reg_errcode_t ret;

   char *fastmap;

diff --git a/posix/regexec.c b/posix/regexec.c

index f315149af88ac6bb..6ca865dc9a7d44d5 100644

--- a/posix/regexec.c

+++ b/posix/regexec.c

@@ -586,8 +586,7 @@ int

 # ifdef _LIBC

 weak_function

 # endif

-re_exec (s)

-     const char *s;

+re_exec (const char *s)

 {

   return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);

 }

diff --git a/stdlib/add_n.c b/stdlib/add_n.c

index afb8e09306d7ecc7..fc5a6dbf71c70c7d 100644

--- a/stdlib/add_n.c

+++ b/stdlib/add_n.c

@@ -22,15 +22,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

 #include "gmp-impl.h"

 mp_limb_t

-#if __STDC__

 mpn_add_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr, mp_size_t size)

-#else

-mpn_add_n (res_ptr, s1_ptr, s2_ptr, size)

-     register mp_ptr res_ptr;

-     register mp_srcptr s1_ptr;

-     register mp_srcptr s2_ptr;

-     mp_size_t size;

-#endif

 {

   register mp_limb_t x, y, cy;

   register mp_size_t j;

diff --git a/stdlib/cmp.c b/stdlib/cmp.c

index 003b9aa236cf9d6d..90a41bbf990e14ae 100644

--- a/stdlib/cmp.c

+++ b/stdlib/cmp.c

@@ -27,14 +27,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

    Return 1 if OP1 > OP2, 0 if they are equal, and -1 if OP1 < OP2.  */

 int

-#if __STDC__

 mpn_cmp (mp_srcptr op1_ptr, mp_srcptr op2_ptr, mp_size_t size)

-#else

-mpn_cmp (op1_ptr, op2_ptr, size)

-     mp_srcptr op1_ptr;

-     mp_srcptr op2_ptr;

-     mp_size_t size;

-#endif

 {

   mp_size_t i;

   mp_limb_t op1_word, op2_word;

diff --git a/stdlib/divmod_1.c b/stdlib/divmod_1.c

index 4e6966bc913927a3..275dceff87094b8a 100644

--- a/stdlib/divmod_1.c

+++ b/stdlib/divmod_1.c

@@ -40,17 +40,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

    here (not udiv_qrnnd).  */

 mp_limb_t

-#if __STDC__

 mpn_divmod_1 (mp_ptr quot_ptr,

 	      mp_srcptr dividend_ptr, mp_size_t dividend_size,

 	      mp_limb_t divisor_limb)

-#else

-mpn_divmod_1 (quot_ptr, dividend_ptr, dividend_size, divisor_limb)

-     mp_ptr quot_ptr;

-     mp_srcptr dividend_ptr;

-     mp_size_t dividend_size;

-     mp_limb_t divisor_limb;

-#endif

 {

   mp_size_t i;

   mp_limb_t n1, n0, r;

diff --git a/stdlib/divrem.c b/stdlib/divrem.c

index c0abb4d9fbcfc0cf..0c5b2da7df0f6880 100644

--- a/stdlib/divrem.c

+++ b/stdlib/divrem.c

@@ -40,19 +40,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

    3. NSIZE >= DSIZE, even if QEXTRA_LIMBS is non-zero.  */

 mp_limb_t

-#if __STDC__

 mpn_divrem (mp_ptr qp, mp_size_t qextra_limbs,

 	    mp_ptr np, mp_size_t nsize,

 	    mp_srcptr dp, mp_size_t dsize)

-#else

-mpn_divrem (qp, qextra_limbs, np, nsize, dp, dsize)

-     mp_ptr qp;

-     mp_size_t qextra_limbs;

-     mp_ptr np;

-     mp_size_t nsize;

-     mp_srcptr dp;

-     mp_size_t dsize;

-#endif

 {

   mp_limb_t most_significant_q_limb = 0;

diff --git a/stdlib/lshift.c b/stdlib/lshift.c

index deb264177a5710f8..d2608e06e9113c4a 100644

--- a/stdlib/lshift.c

+++ b/stdlib/lshift.c

@@ -31,17 +31,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

 */

 mp_limb_t

-#if __STDC__

 mpn_lshift (register mp_ptr wp,

 	    register mp_srcptr up, mp_size_t usize,

 	    register unsigned int cnt)

-#else

-mpn_lshift (wp, up, usize, cnt)

-     register mp_ptr wp;

-     register mp_srcptr up;

-     mp_size_t usize;

-     register unsigned int cnt;

-#endif

 {

   register mp_limb_t high_limb, low_limb;

   register unsigned sh_1, sh_2;

diff --git a/stdlib/mod_1.c b/stdlib/mod_1.c

index d325a931adef007c..72d8ff8110e2c9e2 100644

--- a/stdlib/mod_1.c

+++ b/stdlib/mod_1.c

@@ -37,15 +37,8 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

    here (not udiv_qrnnd).  */

 mp_limb_t

-#if __STDC__

 mpn_mod_1 (mp_srcptr dividend_ptr, mp_size_t dividend_size,

 	   mp_limb_t divisor_limb)

-#else

-mpn_mod_1 (dividend_ptr, dividend_size, divisor_limb)

-     mp_srcptr dividend_ptr;

-     mp_size_t dividend_size;

-     mp_limb_t divisor_limb;

-#endif

 {

   mp_size_t i;

   mp_limb_t n1, n0, r;

diff --git a/stdlib/mul.c b/stdlib/mul.c

index cab3e2b134080f08..1cb9d73ef96a4559 100644

--- a/stdlib/mul.c

+++ b/stdlib/mul.c

@@ -42,18 +42,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

 #endif

 mp_limb_t

-#if __STDC__

 mpn_mul (mp_ptr prodp,

 	 mp_srcptr up, mp_size_t usize,

 	 mp_srcptr vp, mp_size_t vsize)

-#else

-mpn_mul (prodp, up, usize, vp, vsize)

-     mp_ptr prodp;

-     mp_srcptr up;

-     mp_size_t usize;

-     mp_srcptr vp;

-     mp_size_t vsize;

-#endif

 {

   mp_ptr prod_endp = prodp + usize + vsize - 1;

   mp_limb_t cy;

diff --git a/stdlib/mul_n.c b/stdlib/mul_n.c

index 36876c2473e46295..ac2ab42dc887389e 100644

--- a/stdlib/mul_n.c

+++ b/stdlib/mul_n.c

@@ -49,15 +49,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see

    algorithm below.  */

 void

-#if __STDC__

 impn_mul_n_basecase (mp_ptr prodp, mp_srcptr up, mp_srcptr vp, mp_size_t size)

-#else

-impn_mul_n_basecase (prodp, up, vp, size)

-     mp_ptr prodp;

-     mp_srcptr up;

-     mp_srcptr vp;

-     mp_size_t size;

-#endif

 {

   mp_size_t i;

   mp_limb_t cy_limb;

@@ -100,17 +92,8 @@ impn_mul_n_basecase (prodp, up, vp, size)

 }

 void

-#if __STDC__

 impn_mul_n (mp_ptr prodp,

 	     mp_srcptr up, mp_srcptr vp, mp_size_t size, mp_ptr tspace)

-#else

-impn_mul_n (prodp, up, vp, size, tspace)

-     mp_ptr prodp;

-     mp_srcptr up;

-     mp_srcptr vp;

-     mp_size_t size;

-     mp_ptr tspace;

-#endif

 {

   if ((size & 1) != 0)

     {

@@ -219,14 +202,7 @@ impn_mul_n (prodp, up, vp, size, tspace)

 }

 void

-#if __STDC__

 impn_sqr_n_basecase (mp_ptr prodp, mp_srcptr up, mp_size_t size)

-#else

-impn_sqr_n_basecase (prodp, up, size)

-     mp_ptr prodp;

-     mp_srcptr up;

-     mp_size_t size;

-#endif

 {

   mp_size_t i;

   mp_limb_t cy_limb;

@@ -269,16 +245,8 @@ impn_sqr_n_basecase (prodp, up, size)

 }

 void

-#if __STDC__

 impn_sqr_n (mp_ptr prodp,

 	     mp_srcptr up, mp_size_t size, mp_ptr tspace)

-#else

-impn_sqr_n (prodp, up, size, tspace)

-     mp_ptr prodp;

-     mp_srcptr up;