25845f
Introduce prototype-style function definitions in the intl
25845f
subdirectory.  Upstream, this was done as part of a gnulib import:
25845f
25845f
commit 6d248857845aee307440a77062a93b167cd2ac9c
25845f
Author: Will Newton <will.newton@linaro.org>
25845f
Date:   Wed Dec 10 12:03:53 2014 +0000
25845f
25845f
    intl: Merge with gettext version 0.19.3
25845f
25845f
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
25845f
index 98a3606db1353957..64c683384e62ce36 100644
25845f
--- a/intl/bindtextdom.c
25845f
+++ b/intl/bindtextdom.c
25845f
@@ -96,10 +96,8 @@ static void set_binding_values PARAMS ((const char *domainname,
25845f
    If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
25845f
    modified nor returned.  */
25845f
 static void
25845f
-set_binding_values (domainname, dirnamep, codesetp)
25845f
-     const char *domainname;
25845f
-     const char **dirnamep;
25845f
-     const char **codesetp;
25845f
+set_binding_values (const char *domainname, const char **dirnamep,
25845f
+		    const char **codesetp)
25845f
 {
25845f
   struct binding *binding;
25845f
   int modified;
25845f
@@ -341,9 +339,7 @@ set_binding_values (domainname, dirnamep, codesetp)
25845f
 /* Specify that the DOMAINNAME message catalog will be found
25845f
    in DIRNAME rather than in the system locale data base.  */
25845f
 char *
25845f
-BINDTEXTDOMAIN (domainname, dirname)
25845f
-     const char *domainname;
25845f
-     const char *dirname;
25845f
+BINDTEXTDOMAIN (const char *domainname, const char *dirname)
25845f
 {
25845f
   set_binding_values (domainname, &dirname, NULL);
25845f
   return (char *) dirname;
25845f
@@ -352,9 +348,7 @@ BINDTEXTDOMAIN (domainname, dirname)
25845f
 /* Specify the character encoding in which the messages from the
25845f
    DOMAINNAME message catalog will be returned.  */
25845f
 char *
25845f
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
25845f
-     const char *domainname;
25845f
-     const char *codeset;
25845f
+BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
25845f
 {
25845f
   set_binding_values (domainname, NULL, &codeset);
25845f
   return (char *) codeset;
25845f
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
25845f
index 0f2942be4556ef97..a54c747e346b7599 100644
25845f
--- a/intl/dcgettext.c
25845f
+++ b/intl/dcgettext.c
25845f
@@ -44,10 +44,7 @@
25845f
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
25845f
    locale.  */
25845f
 char *
25845f
-DCGETTEXT (domainname, msgid, category)
25845f
-     const char *domainname;
25845f
-     const char *msgid;
25845f
-     int category;
25845f
+DCGETTEXT (const char *domainname, const char *msgid, int category)
25845f
 {
25845f
   return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
25845f
 }
25845f
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
25845f
index c005f1b88d2da1a5..02eb8ad10ebd6eb4 100644
25845f
--- a/intl/dcigettext.c
25845f
+++ b/intl/dcigettext.c
25845f
@@ -225,9 +225,7 @@ static void *root;
25845f
 /* Function to compare two entries in the table of known translations.  */
25845f
 static int transcmp PARAMS ((const void *p1, const void *p2));
25845f
 static int
25845f
-transcmp (p1, p2)
25845f
-     const void *p1;
25845f
-     const void *p2;
25845f
+transcmp (const void *p1, const void *p2)
25845f
 {
25845f
   const struct known_translation_t *s1;
25845f
   const struct known_translation_t *s2;
25845f
@@ -407,13 +405,8 @@ static int enable_secure;
25845f
    CATEGORY locale and, if PLURAL is nonzero, search over string
25845f
    depending on the plural form determined by N.  */
25845f
 char *
25845f
-DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
25845f
-     const char *domainname;
25845f
-     const char *msgid1;
25845f
-     const char *msgid2;
25845f
-     int plural;
25845f
-     unsigned long int n;
25845f
-     int category;
25845f
+DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
25845f
+	    int plural, unsigned long int n, int category)
25845f
 {
25845f
 #ifndef HAVE_ALLOCA
25845f
   struct block_list *block_list = NULL;
25845f
@@ -743,12 +736,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
25845f
 
25845f
 char *
25845f
 internal_function
25845f
-_nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp)
25845f
-     struct loaded_l10nfile *domain_file;
25845f
-     struct binding *domainbinding;
25845f
-     const char *msgid;
25845f
-     int convert;
25845f
-     size_t *lengthp;
25845f
+_nl_find_msg (struct loaded_l10nfile *domain_file, struct binding *domainbinding,
25845f
+	      const char *msgid, int convert, size_t *lengthp)
25845f
 {
25845f
   struct loaded_domain *domain;
25845f
   nls_uint32 nstrings;
25845f
@@ -1242,11 +1231,8 @@ _nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp)
25845f
 /* Look up a plural variant.  */
25845f
 static char *
25845f
 internal_function
25845f
-plural_lookup (domain, n, translation, translation_len)
25845f
-     struct loaded_l10nfile *domain;
25845f
-     unsigned long int n;
25845f
-     const char *translation;
25845f
-     size_t translation_len;
25845f
+plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
25845f
+	       const char *translation, size_t translation_len)
25845f
 {
25845f
   struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
25845f
   unsigned long int index;
25845f
@@ -1283,8 +1269,7 @@ plural_lookup (domain, n, translation, translation_len)
25845f
 /* Return string representation of locale CATEGORY.  */
25845f
 static const char *
25845f
 internal_function
25845f
-category_to_name (category)
25845f
-     int category;
25845f
+category_to_name (int category)
25845f
 {
25845f
   const char *retval;
25845f
 
25845f
@@ -1344,9 +1329,7 @@ category_to_name (category)
25845f
 /* Guess value of current locale from value of the environment variables.  */
25845f
 static const char *
25845f
 internal_function
25845f
-guess_category_value (category, categoryname)
25845f
-     int category;
25845f
-     const char *categoryname;
25845f
+guess_category_value (int category, const char *categoryname)
25845f
 {
25845f
   const char *language;
25845f
   const char *retval;
25845f
@@ -1374,8 +1357,7 @@ guess_category_value (category, categoryname)
25845f
 /* Returns the output charset.  */
25845f
 static const char *
25845f
 internal_function
25845f
-get_output_charset (domainbinding)
25845f
-     struct binding *domainbinding;
25845f
+get_output_charset (struct binding *domainbinding)
25845f
 {
25845f
   /* The output charset should normally be determined by the locale.  But
25845f
      sometimes the locale is not used or not correctly set up, so we provide
25845f
@@ -1433,9 +1415,7 @@ get_output_charset (domainbinding)
25845f
    to be defined.  */
25845f
 #if !_LIBC && !HAVE_STPCPY
25845f
 static char *
25845f
-stpcpy (dest, src)
25845f
-     char *dest;
25845f
-     const char *src;
25845f
+stpcpy (char *dest, const char *src)
25845f
 {
25845f
   while ((*dest++ = *src++) != '\0')
25845f
     /* Do nothing. */ ;
25845f
@@ -1445,10 +1425,7 @@ stpcpy (dest, src)
25845f
 
25845f
 #if !_LIBC && !HAVE_MEMPCPY
25845f
 static void *
25845f
-mempcpy (dest, src, n)
25845f
-     void *dest;
25845f
-     const void *src;
25845f
-     size_t n;
25845f
+mempcpy (void *dest, const void *src, size_t n)
25845f
 {
25845f
   return (void *) ((char *) memcpy (dest, src, n) + n);
25845f
 }
25845f
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
25845f
index b0e2ee8d8cb214ea..1a64fd1f818823c8 100644
25845f
--- a/intl/dcngettext.c
25845f
+++ b/intl/dcngettext.c
25845f
@@ -44,12 +44,8 @@
25845f
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
25845f
    locale.  */
25845f
 char *
25845f
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
25845f
-     const char *domainname;
25845f
-     const char *msgid1;
25845f
-     const char *msgid2;
25845f
-     unsigned long int n;
25845f
-     int category;
25845f
+DCNGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
25845f
+            unsigned long int n, int category)
25845f
 {
25845f
   return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
25845f
 }
25845f
diff --git a/intl/dgettext.c b/intl/dgettext.c
25845f
index 7718f4e4e021bbfd..eba96b745c0c24c7 100644
25845f
--- a/intl/dgettext.c
25845f
+++ b/intl/dgettext.c
25845f
@@ -46,9 +46,7 @@
25845f
 /* Look up MSGID in the DOMAINNAME message catalog of the current
25845f
    LC_MESSAGES locale.  */
25845f
 char *
25845f
-DGETTEXT (domainname, msgid)
25845f
-     const char *domainname;
25845f
-     const char *msgid;
25845f
+DGETTEXT (const char *domainname, const char *msgid)
25845f
 {
25845f
   return DCGETTEXT (domainname, msgid, LC_MESSAGES);
25845f
 }
25845f
diff --git a/intl/dngettext.c b/intl/dngettext.c
25845f
index 18ff68e94e7b19b3..8b62b1b7d60608b3 100644
25845f
--- a/intl/dngettext.c
25845f
+++ b/intl/dngettext.c
25845f
@@ -46,11 +46,8 @@
25845f
 /* Look up MSGID in the DOMAINNAME message catalog of the current
25845f
    LC_MESSAGES locale and skip message according to the plural form.  */
25845f
 char *
25845f
-DNGETTEXT (domainname, msgid1, msgid2, n)
25845f
-     const char *domainname;
25845f
-     const char *msgid1;
25845f
-     const char *msgid2;
25845f
-     unsigned long int n;
25845f
+DNGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
25845f
+           unsigned long int n)
25845f
 {
25845f
   return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
25845f
 }
25845f
diff --git a/intl/explodename.c b/intl/explodename.c
25845f
index 52506c4c70671a29..679deebfc4a8a628 100644
25845f
--- a/intl/explodename.c
25845f
+++ b/intl/explodename.c
25845f
@@ -40,8 +40,7 @@
25845f
 static char *_nl_find_language PARAMS ((const char *name));
25845f
 
25845f
 static char *
25845f
-_nl_find_language (name)
25845f
-     const char *name;
25845f
+_nl_find_language (const char *name)
25845f
 {
25845f
   while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.')
25845f
     ++name;
25845f
@@ -51,14 +50,9 @@ _nl_find_language (name)
25845f
 
25845f
 
25845f
 int
25845f
-_nl_explode_name (name, language, modifier, territory, codeset,
25845f
-		  normalized_codeset)
25845f
-     char *name;
25845f
-     const char **language;
25845f
-     const char **modifier;
25845f
-     const char **territory;
25845f
-     const char **codeset;
25845f
-     const char **normalized_codeset;
25845f
+_nl_explode_name (char *name, const char **language, const char **modifier,
25845f
+		  const char **territory, const char **codeset,
25845f
+		  const char **normalized_codeset)
25845f
 {
25845f
   char *cp;
25845f
   int mask;
25845f
diff --git a/intl/finddomain.c b/intl/finddomain.c
25845f
index 4fff9dad5de54dad..6c3b80b26b6fc88f 100644
25845f
--- a/intl/finddomain.c
25845f
+++ b/intl/finddomain.c
25845f
@@ -49,11 +49,8 @@ static struct loaded_l10nfile *_nl_loaded_domains;
25845f
    established bindings.  */
25845f
 struct loaded_l10nfile *
25845f
 internal_function
25845f
-_nl_find_domain (dirname, locale, domainname, domainbinding)
25845f
-     const char *dirname;
25845f
-     char *locale;
25845f
-     const char *domainname;
25845f
-     struct binding *domainbinding;
25845f
+_nl_find_domain (const char *dirname, char *locale, const char *domainname,
25845f
+		 struct binding *domainbinding)
25845f
 {
25845f
   struct loaded_l10nfile *retval;
25845f
   const char *language;
25845f
diff --git a/intl/gettext.c b/intl/gettext.c
25845f
index fbc598407d9a7e3a..028f0e713971b475 100644
25845f
--- a/intl/gettext.c
25845f
+++ b/intl/gettext.c
25845f
@@ -52,8 +52,7 @@
25845f
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
25845f
    text).  */
25845f
 char *
25845f
-GETTEXT (msgid)
25845f
-     const char *msgid;
25845f
+GETTEXT (const char *msgid)
25845f
 {
25845f
   return DCGETTEXT (NULL, msgid, LC_MESSAGES);
25845f
 }
25845f
diff --git a/intl/hash-string.c b/intl/hash-string.c
25845f
index 1b6cfa01b683a9f2..cf267492cc8d3834 100644
25845f
--- a/intl/hash-string.c
25845f
+++ b/intl/hash-string.c
25845f
@@ -23,8 +23,7 @@
25845f
    [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
25845f
    1986, 1987 Bell Telephone Laboratories, Inc.]  */
25845f
 unsigned long int
25845f
-__hash_string (str_param)
25845f
-     const char *str_param;
25845f
+__hash_string (const char *str_param)
25845f
 {
25845f
   unsigned long int hval, g;
25845f
   const char *str = str_param;
25845f
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
25845f
index 424f2dffc3d7b8e6..7bc2ec81bbbc3d9c 100644
25845f
--- a/intl/l10nflist.c
25845f
+++ b/intl/l10nflist.c
25845f
@@ -69,9 +69,7 @@ static char *stpcpy PARAMS ((char *dest, const char *src));
25845f
 static size_t argz_count__ PARAMS ((const char *argz, size_t len));
25845f
 
25845f
 static size_t
25845f
-argz_count__ (argz, len)
25845f
-     const char *argz;
25845f
-     size_t len;
25845f
+argz_count__ (const char *argz, size_t len)
25845f
 {
25845f
   size_t count = 0;
25845f
   while (len > 0)
25845f
@@ -93,10 +91,7 @@ argz_count__ (argz, len)
25845f
 static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
25845f
 
25845f
 static void
25845f
-argz_stringify__ (argz, len, sep)
25845f
-     char *argz;
25845f
-     size_t len;
25845f
-     int sep;
25845f
+argz_stringify__ (char *argz, size_t len, int sep)
25845f
 {
25845f
   while (len > 0)
25845f
     {
25845f
@@ -116,10 +111,7 @@ static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
25845f
 				  const char *entry));
25845f
 
25845f
 static char *
25845f
-argz_next__ (argz, argz_len, entry)
25845f
-     char *argz;
25845f
-     size_t argz_len;
25845f
-     const char *entry;
25845f
+argz_next__ (char *argz, size_t argz_len, const char *entry)
25845f
 {
25845f
   if (entry)
25845f
     {
25845f
@@ -144,8 +136,7 @@ argz_next__ (argz, argz_len, entry)
25845f
 static int pop PARAMS ((int x));
25845f
 
25845f
 static inline int
25845f
-pop (x)
25845f
-     int x;
25845f
+pop (int x)
25845f
 {
25845f
   /* We assume that no more than 16 bits are used.  */
25845f
   x = ((x & ~0x5555) >> 1) + (x & 0x5555);
25845f
@@ -159,20 +150,12 @@ pop (x)
25845f
 
25845f
 
25845f
 struct loaded_l10nfile *
25845f
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
25845f
-		    territory, codeset, normalized_codeset, modifier,
25845f
-		    filename, do_allocate)
25845f
-     struct loaded_l10nfile **l10nfile_list;
25845f
-     const char *dirlist;
25845f
-     size_t dirlist_len;
25845f
-     int mask;
25845f
-     const char *language;
25845f
-     const char *territory;
25845f
-     const char *codeset;
25845f
-     const char *normalized_codeset;
25845f
-     const char *modifier;
25845f
-     const char *filename;
25845f
-     int do_allocate;
25845f
+_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
25845f
+		    const char *dirlist, size_t dirlist_len,
25845f
+		    int mask, const char *language,
25845f
+		    const char *territory, const char *codeset,
25845f
+		    const char *normalized_codeset, const char *modifier,
25845f
+		    const char *filename, int do_allocate)
25845f
 {
25845f
   char *abs_filename;
25845f
   struct loaded_l10nfile *last = NULL;
25845f
@@ -315,9 +298,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
25845f
    names.  The return value is dynamically allocated and has to be
25845f
    freed by the caller.  */
25845f
 const char *
25845f
-_nl_normalize_codeset (codeset, name_len)
25845f
-     const char *codeset;
25845f
-     size_t name_len;
25845f
+_nl_normalize_codeset (const char *codeset, size_t name_len)
25845f
 {
25845f
   int len = 0;
25845f
   int only_digit = 1;
25845f
@@ -368,9 +349,7 @@ _nl_normalize_codeset (codeset, name_len)
25845f
    to be defined.  */
25845f
 #if !_LIBC && !HAVE_STPCPY
25845f
 static char *
25845f
-stpcpy (dest, src)
25845f
-     char *dest;
25845f
-     const char *src;
25845f
+stpcpy (char *dest, const char *src)
25845f
 {
25845f
   while ((*dest++ = *src++) != '\0')
25845f
     /* Do nothing. */ ;
25845f
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
25845f
index 243783a9ac4d0929..8ee719d9c3034724 100644
25845f
--- a/intl/loadmsgcat.c
25845f
+++ b/intl/loadmsgcat.c
25845f
@@ -487,8 +487,7 @@ int _nl_msg_cat_cntr;
25845f
 
25845f
 /* Expand a system dependent string segment.  Return NULL if unsupported.  */
25845f
 static const char *
25845f
-get_sysdep_segment_value (name)
25845f
-     const char *name;
25845f
+get_sysdep_segment_value (const char *name)
25845f
 {
25845f
   /* Test for an ISO C 99 section 7.8.1 format string directive.
25845f
      Syntax:
25845f
@@ -757,9 +756,8 @@ get_sysdep_segment_value (name)
25845f
    message catalog do nothing.  */
25845f
 void
25845f
 internal_function
25845f
-_nl_load_domain (domain_file, domainbinding)
25845f
-     struct loaded_l10nfile *domain_file;
25845f
-     struct binding *domainbinding;
25845f
+_nl_load_domain (struct loaded_l10nfile *domain_file,
25845f
+		 struct binding *domainbinding)
25845f
 {
25845f
   __libc_lock_define_initialized_recursive (static, lock);
25845f
   int fd = -1;
25845f
@@ -1278,8 +1276,7 @@ _nl_load_domain (domain_file, domainbinding)
25845f
 #ifdef _LIBC
25845f
 void
25845f
 internal_function __libc_freeres_fn_section
25845f
-_nl_unload_domain (domain)
25845f
-     struct loaded_domain *domain;
25845f
+_nl_unload_domain (struct loaded_domain *domain)
25845f
 {
25845f
   size_t i;
25845f
 
25845f
diff --git a/intl/localealias.c b/intl/localealias.c
25845f
index 2f067dfe2cd7a130..29eef89c9e3d86bc 100644
25845f
--- a/intl/localealias.c
25845f
+++ b/intl/localealias.c
25845f
@@ -137,8 +137,7 @@ static int alias_compare PARAMS ((const struct alias_map *map1,
25845f
 
25845f
 
25845f
 const char *
25845f
-_nl_expand_alias (name)
25845f
-    const char *name;
25845f
+_nl_expand_alias (const char *name)
25845f
 {
25845f
   static const char *locale_alias_path = LOCALE_ALIAS_PATH;
25845f
   struct alias_map *retval;
25845f
@@ -200,9 +199,7 @@ _nl_expand_alias (name)
25845f
 
25845f
 static size_t
25845f
 internal_function
25845f
-read_alias_file (fname, fname_len)
25845f
-     const char *fname;
25845f
-     int fname_len;
25845f
+read_alias_file (const char *fname, int fname_len)
25845f
 {
25845f
   FILE *fp;
25845f
   char *full_fname;
25845f
@@ -381,9 +378,7 @@ extend_alias_table (void)
25845f
 
25845f
 
25845f
 static int
25845f
-alias_compare (map1, map2)
25845f
-     const struct alias_map *map1;
25845f
-     const struct alias_map *map2;
25845f
+alias_compare (const struct alias_map *map1, const struct alias_map *map2)
25845f
 {
25845f
 #if defined _LIBC || defined HAVE_STRCASECMP
25845f
   return strcasecmp (map1->alias, map2->alias);
25845f
diff --git a/intl/ngettext.c b/intl/ngettext.c
25845f
index 109e9da0e5cdc5d4..f3f8e076a1fc55aa 100644
25845f
--- a/intl/ngettext.c
25845f
+++ b/intl/ngettext.c
25845f
@@ -54,10 +54,7 @@
25845f
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
25845f
    text).  */
25845f
 char *
25845f
-NGETTEXT (msgid1, msgid2, n)
25845f
-     const char *msgid1;
25845f
-     const char *msgid2;
25845f
-     unsigned long int n;
25845f
+NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
25845f
 {
25845f
   return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
25845f
 }
25845f
diff --git a/intl/plural-eval.c b/intl/plural-eval.c
25845f
index e692e379b14100b7..d44eb257e466e852 100644
25845f
--- a/intl/plural-eval.c
25845f
+++ b/intl/plural-eval.c
25845f
@@ -22,9 +22,7 @@ static unsigned long int plural_eval (const struct expression *pexp,
25845f
 
25845f
 static unsigned long int
25845f
 internal_function
25845f
-plural_eval (pexp, n)
25845f
-     const struct expression *pexp;
25845f
-     unsigned long int n;
25845f
+plural_eval (const struct expression *pexp, unsigned long int n)
25845f
 {
25845f
   switch (pexp->nargs)
25845f
     {
25845f
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
25845f
index e157bba4adfca8df..abfbf0a1ef26a76d 100644
25845f
--- a/intl/plural-exp.c
25845f
+++ b/intl/plural-exp.c
25845f
@@ -96,10 +96,9 @@ init_germanic_plural (void)
25845f
 
25845f
 void
25845f
 internal_function
25845f
-EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
25845f
-     const char *nullentry;
25845f
-     const struct expression **pluralp;
25845f
-     unsigned long int *npluralsp;
25845f
+EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
25845f
+			   const struct expression **pluralp,
25845f
+			   unsigned long int *npluralsp)
25845f
 {
25845f
   if (nullentry != NULL)
25845f
     {
25845f
diff --git a/intl/plural.c b/intl/plural.c
25845f
index 0d8bf4c6d59ff646..3898ab6aeaadcc2d 100644
25845f
--- a/intl/plural.c
25845f
+++ b/intl/plural.c
25845f
@@ -212,10 +212,7 @@ static void yyerror PARAMS ((const char *str));
25845f
 /* Allocation of expressions.  */
25845f
 
25845f
 static struct expression *
25845f
-new_exp (nargs, op, args)
25845f
-     int nargs;
25845f
-     enum operator op;
25845f
-     struct expression * const *args;
25845f
+new_exp (int nargs, enum operator op, struct expression * const *args)
25845f
 {
25845f
   int i;
25845f
   struct expression *newp;
25845f
@@ -244,16 +241,13 @@ new_exp (nargs, op, args)
25845f
 }
25845f
 
25845f
 static inline struct expression *
25845f
-new_exp_0 (op)
25845f
-     enum operator op;
25845f
+new_exp_0 (enum operator op)
25845f
 {
25845f
   return new_exp (0, op, NULL);
25845f
 }
25845f
 
25845f
 static inline struct expression *
25845f
-new_exp_1 (op, right)
25845f
-     enum operator op;
25845f
-     struct expression *right;
25845f
+new_exp_1 (enum operator op, struct expression *right)
25845f
 {
25845f
   struct expression *args[1];
25845f
 
25845f
@@ -262,10 +256,7 @@ new_exp_1 (op, right)
25845f
 }
25845f
 
25845f
 static struct expression *
25845f
-new_exp_2 (op, left, right)
25845f
-     enum operator op;
25845f
-     struct expression *left;
25845f
-     struct expression *right;
25845f
+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
25845f
 {
25845f
   struct expression *args[2];
25845f
 
25845f
@@ -275,11 +266,8 @@ new_exp_2 (op, left, right)
25845f
 }
25845f
 
25845f
 static inline struct expression *
25845f
-new_exp_3 (op, bexp, tbranch, fbranch)
25845f
-     enum operator op;
25845f
-     struct expression *bexp;
25845f
-     struct expression *tbranch;
25845f
-     struct expression *fbranch;
25845f
+new_exp_3 (enum operator op, struct expression *bexp,
25845f
+	   struct expression *tbranch, struct expression *fbranch)
25845f
 {
25845f
   struct expression *args[3];
25845f
 
25845f
@@ -1874,8 +1862,7 @@ yyreturn:
25845f
 
25845f
 void
25845f
 internal_function
25845f
-FREE_EXPRESSION (exp)
25845f
-     struct expression *exp;
25845f
+FREE_EXPRESSION (struct expression *exp)
25845f
 {
25845f
   if (exp == NULL)
25845f
     return;
25845f
@@ -1901,9 +1888,7 @@ FREE_EXPRESSION (exp)
25845f
 
25845f
 
25845f
 static int
25845f
-yylex (lval, pexp)
25845f
-     YYSTYPE *lval;
25845f
-     const char **pexp;
25845f
+yylex (YYSTYPE *lval, const char **pexp)
25845f
 {
25845f
   const char *exp = *pexp;
25845f
   int result;
25845f
@@ -2046,8 +2031,7 @@ yylex (lval, pexp)
25845f
 
25845f
 
25845f
 static void
25845f
-yyerror (str)
25845f
-     const char *str;
25845f
+yyerror (const char *str)
25845f
 {
25845f
   /* Do nothing.  We don't print error messages here.  */
25845f
 }
25845f
diff --git a/intl/plural.y b/intl/plural.y
25845f
index 2df3604dcf7ecfb6..7cfac172bd157b8a 100644
25845f
--- a/intl/plural.y
25845f
+++ b/intl/plural.y
25845f
@@ -72,10 +72,7 @@ static void yyerror PARAMS ((const char *str));
25845f
 /* Allocation of expressions.  */
25845f
 
25845f
 static struct expression *
25845f
-new_exp (nargs, op, args)
25845f
-     int nargs;
25845f
-     enum operator op;
25845f
-     struct expression * const *args;
25845f
+new_exp (int nargs, enum operator op, struct expression * const *args)
25845f
 {
25845f
   int i;
25845f
   struct expression *newp;
25845f
@@ -104,16 +101,13 @@ new_exp (nargs, op, args)
25845f
 }
25845f
 
25845f
 static inline struct expression *
25845f
-new_exp_0 (op)
25845f
-     enum operator op;
25845f
+new_exp_0 (enum operator op)
25845f
 {
25845f
   return new_exp (0, op, NULL);
25845f
 }
25845f
 
25845f
 static inline struct expression *
25845f
-new_exp_1 (op, right)
25845f
-     enum operator op;
25845f
-     struct expression *right;
25845f
+new_exp_1 (enum operator op, struct expression *right)
25845f
 {
25845f
   struct expression *args[1];
25845f
 
25845f
@@ -122,10 +116,7 @@ new_exp_1 (op, right)
25845f
 }
25845f
 
25845f
 static struct expression *
25845f
-new_exp_2 (op, left, right)
25845f
-     enum operator op;
25845f
-     struct expression *left;
25845f
-     struct expression *right;
25845f
+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
25845f
 {
25845f
   struct expression *args[2];
25845f
 
25845f
@@ -135,11 +126,8 @@ new_exp_2 (op, left, right)
25845f
 }
25845f
 
25845f
 static inline struct expression *
25845f
-new_exp_3 (op, bexp, tbranch, fbranch)
25845f
-     enum operator op;
25845f
-     struct expression *bexp;
25845f
-     struct expression *tbranch;
25845f
-     struct expression *fbranch;
25845f
+new_exp_3 (enum operator op, struct expression *bexp,
25845f
+	   struct expression *tbranch, struct expression *fbranch)
25845f
 {
25845f
   struct expression *args[3];
25845f
 
25845f
@@ -230,8 +218,7 @@ exp:	  exp '?' exp ':' exp
25845f
 
25845f
 void
25845f
 internal_function
25845f
-FREE_EXPRESSION (exp)
25845f
-     struct expression *exp;
25845f
+FREE_EXPRESSION (struct expression *exp)
25845f
 {
25845f
   if (exp == NULL)
25845f
     return;
25845f
@@ -257,9 +244,7 @@ FREE_EXPRESSION (exp)
25845f
 
25845f
 
25845f
 static int
25845f
-yylex (lval, pexp)
25845f
-     YYSTYPE *lval;
25845f
-     const char **pexp;
25845f
+yylex (YYSTYPE *lval, const char **pexp)
25845f
 {
25845f
   const char *exp = *pexp;
25845f
   int result;
25845f
@@ -402,8 +387,7 @@ yylex (lval, pexp)
25845f
 
25845f
 
25845f
 static void
25845f
-yyerror (str)
25845f
-     const char *str;
25845f
+yyerror (const char *str)
25845f
 {
25845f
   /* Do nothing.  We don't print error messages here.  */
25845f
 }
25845f
diff --git a/intl/textdomain.c b/intl/textdomain.c
25845f
index 35fb2e4c9951fe74..7d1029fa02ffdb34 100644
25845f
--- a/intl/textdomain.c
25845f
+++ b/intl/textdomain.c
25845f
@@ -77,8 +77,7 @@ __libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
25845f
    If DOMAINNAME is null, return the current default.
25845f
    If DOMAINNAME is "", reset to the default of "messages".  */
25845f
 char *
25845f
-TEXTDOMAIN (domainname)
25845f
-     const char *domainname;
25845f
+TEXTDOMAIN (const char *domainname)
25845f
 {
25845f
   char *new_domain;
25845f
   char *old_domain;