* iconv/gconv_conf.c: Convert GCC extension initializer syntax to C99.

	* iconvdata/gap.awk: Likewise.
	* iconvdata/gen-8bit-gap-1.sh: Likewise.
	* iconvdata/gen-8bit-gap.sh: Likewise.
	* locale/C-address.c: Likewise.
	* locale/C-collate.c: Likewise.
	* locale/C-ctype.c: Likewise.
	* locale/C-identification.c: Likewise.
	* locale/C-measurement.c: Likewise.
	* locale/C-messages.c: Likewise.
	* locale/C-monetary.c: Likewise.
	* locale/C-name.c: Likewise.
	* locale/C-numeric.c: Likewise.
	* locale/C-paper.c: Likewise.
	* locale/C-telephone.c: Likewise.
	* locale/C-time.c: Likewise.
	* nscd/connections.c: Likewise.
	* nscd/grpcache.c: Likewise.
	* nscd/hstcache.c: Likewise.
	* nscd/pwdcache.c: Likewise.
	* stdio-common/vfprintf.c: Likewise.
	* stdlib/random.c: Likewise.
	* sysdeps/generic/siglist.c: Likewise.
	* sysdeps/i386/fpu/bits/mathinline.h: Likewise.
	* sysdeps/ieee754/bits/nan.h: Likewise.
	* sysdeps/posix/sprofil.c: Likewise.
	* sysdeps/unix/sysv/linux/sleep.c: Likewise.
	* sysdeps/unix/sysv/linux/sysctl.c: Likewise.
	* sysdeps/unix/sysv/linux/usleep.c: Likewise.

26 files changed, 416 insertions, 391 deletions

diff --git a/ChangeLog b/ChangeLog
index 84a02c5643..401961a9dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2002-12-15  Art Haas  <ahaas@airmail.net>
+
+	* iconv/gconv_conf.c: Convert GCC extension initializer syntax to C99.
+	* iconvdata/gap.awk: Likewise.
+	* iconvdata/gen-8bit-gap-1.sh: Likewise.
+	* iconvdata/gen-8bit-gap.sh: Likewise.
+	* locale/C-address.c: Likewise.
+	* locale/C-collate.c: Likewise.
+	* locale/C-ctype.c: Likewise.
+	* locale/C-identification.c: Likewise.
+	* locale/C-measurement.c: Likewise.
+	* locale/C-messages.c: Likewise.
+	* locale/C-monetary.c: Likewise.
+	* locale/C-name.c: Likewise.
+	* locale/C-numeric.c: Likewise.
+	* locale/C-paper.c: Likewise.
+	* locale/C-telephone.c: Likewise.
+	* locale/C-time.c: Likewise.
+	* nscd/connections.c: Likewise.
+	* nscd/grpcache.c: Likewise.
+	* nscd/hstcache.c: Likewise.
+	* nscd/pwdcache.c: Likewise.
+	* stdio-common/vfprintf.c: Likewise.
+	* stdlib/random.c: Likewise.
+	* sysdeps/generic/siglist.c: Likewise.
+	* sysdeps/i386/fpu/bits/mathinline.h: Likewise.
+	* sysdeps/ieee754/bits/nan.h: Likewise.
+	* sysdeps/posix/sprofil.c: Likewise.
+	* sysdeps/unix/sysv/linux/sleep.c: Likewise.
+	* sysdeps/unix/sysv/linux/sysctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/usleep.c: Likewise.
+
 2002-12-15  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/unix/sysv/linux/readv.c (do_readv): Use prototype defn.
@@ -18,13 +50,6 @@
 
 	* resolv/Versions (libresolv: GLIBC_2.3.2): New set, add __p_rcode.
 
-2002-12-15  Art Haas  <ahaas@airmail.net>
-
-	* nscd/connections.c: C99 initializer conversion.
-	* nscd/grpcache.c: Same.
-	* nscd/hstcache.c: Same.
-	* nscd/pwdcache.c: Same.
-
 2002-12-15  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/fcntl.c (do_fcntl): This is the
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 1262e76618..746c2245a3 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -64,11 +64,11 @@ static struct gconv_module builtin_modules[] =
 #define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, BtowcFct, \
 			       MinF, MaxF, MinT, MaxT) \
   {									      \
-    from_string: From,							      \
-    to_string: To,							      \
-    cost_hi: Cost,							      \
-    cost_lo: INT_MAX,							      \
-    module_name: Name							      \
+    .from_string = From,						      \
+    .to_string = To,							      \
+    .cost_hi = Cost,							      \
+    .cost_lo = INT_MAX,							      \
+    .module_name = Name							      \
   },
 #define BUILTIN_ALIAS(From, To)
 
diff --git a/iconvdata/gap.awk b/iconvdata/gap.awk
index 583d22bed9..6c5ef51a04 100644
--- a/iconvdata/gap.awk
+++ b/iconvdata/gap.awk
@@ -26,7 +26,7 @@ function tonum(str)
     {
       if (last)
 	{
-	  printf ("  { start: 0x%04x, end: 0x%04x, idx: %5d },\n",
+	  printf ("  { .start = 0x%04x, .end = 0x%04x, .idx = %5d },\n",
 		  first, last, idx);
 	  idx -= u - last - 1;
 	}
@@ -35,5 +35,5 @@ function tonum(str)
   last = u;
 }
 
-END { printf ("  { start: 0x%04x, end: 0x%04x, idx: %5d },\n",
+END { printf ("  { .start = 0x%04x, .end = 0x%04x, .idx = %5d },\n",
 	      first, last, idx); }
diff --git a/iconvdata/gen-8bit-gap-1.sh b/iconvdata/gen-8bit-gap-1.sh
index aeb6069e50..7b8baeb871 100644
--- a/iconvdata/gen-8bit-gap-1.sh
+++ b/iconvdata/gen-8bit-gap-1.sh
@@ -7,7 +7,7 @@ echo "};"
 echo "static const struct gap from_idx[] = {"
 sed -ne 's/^<U\(....\)>[[:space:]]*.x[A-Fa-f]..*/\1/p' \
     "$@" | sort -u | $AWK -f gap.awk
-echo "  { start: 0xffff, end: 0xffff, idx:     0 }"
+echo "  { .start = 0xffff, .end = 0xffff, .idx =     0 }"
 echo "};"
 echo "static const char iso88597_from_ucs4[] = {"
 sed -ne 's/^<U\(....\)>[[:space:]]*.x\([A-Fa-f].\).*/0x\1 0x\2/p' \
diff --git a/iconvdata/gen-8bit-gap.sh b/iconvdata/gen-8bit-gap.sh
index ce14c0be01..d0b59d320c 100644
--- a/iconvdata/gen-8bit-gap.sh
+++ b/iconvdata/gen-8bit-gap.sh
@@ -7,7 +7,7 @@ echo "};"
 echo "static const struct gap from_idx[] = {"
 sed -ne 's/^<U\(....\).*/\1/p' \
     "$@" | sort -u | $AWK -f gap.awk
-echo "  { start: 0xffff, end: 0xffff, idx:     0 }"
+echo "  { .start = 0xffff, .end = 0xffff, .idx =     0 }"
 echo "};"
 echo "static const char from_ucs4[] = {"
 sed -ne 's/^<U\(....\)>[[:space:]]*.x\(..\).*/\1 \2/p' \
diff --git a/locale/C-address.c b/locale/C-address.c
index 2c6a088860..e9e6b1aa81 100644
--- a/locale/C-address.c
+++ b/locale/C-address.c
@@ -33,18 +33,18 @@ const struct locale_data _nl_C_LC_ADDRESS attribute_hidden =
   0,
   13,
   {
-    { string: "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: _nl_C_codeset }
+    { .string = "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = _nl_C_codeset }
   }
 };
diff --git a/locale/C-collate.c b/locale/C-collate.c
index f5a61f2b5c..cc8c8ee81f 100644
--- a/locale/C-collate.c
+++ b/locale/C-collate.c
@@ -108,42 +108,42 @@ const struct locale_data _nl_C_LC_COLLATE attribute_hidden =
   19,
   {
     /* _NL_COLLATE_NRULES */
-    { word: 0 },
+    { .word = 0 },
     /* _NL_COLLATE_RULESETS */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_TABLEMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_WEIGHTMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_EXTRAMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_INDIRECTMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_GAP1 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_GAP2 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_GAP3 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_TABLEWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_WEIGHTWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_EXTRAWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_INDIRECTWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_SYMB_HASH_SIZEMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_SYMB_TABLEMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_SYMB_EXTRAMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_COLLSEQMB */
-    { string: collseqmb },
+    { .string = collseqmb },
     /* _NL_COLLATE_COLLSEQWC */
-    { string: (const char *) collseqwc },
+    { .string = (const char *) collseqwc },
     /* _NL_COLLATE_CODESET */
-    { string: _nl_C_codeset }
+    { .string = _nl_C_codeset }
   }
 };
diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index c65c345dd2..ff56258e58 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -548,27 +548,27 @@ const struct locale_data _nl_C_LC_CTYPE attribute_hidden =
   NR_FIXED + NR_CLASSES + NR_MAPS,
   {
     /* _NL_CTYPE_CLASS */
-    { string: _nl_C_LC_CTYPE_class },
+    { .string = _nl_C_LC_CTYPE_class },
     /* _NL_CTYPE_TOUPPER */
-    { string: (const char *) _nl_C_LC_CTYPE_toupper },
+    { .string = (const char *) _nl_C_LC_CTYPE_toupper },
     /* _NL_CTYPE_GAP1 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_CTYPE_TOLOWER */
-    { string: (const char *) _nl_C_LC_CTYPE_tolower },
+    { .string = (const char *) _nl_C_LC_CTYPE_tolower },
     /* _NL_CTYPE_GAP2 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_CTYPE_CLASS32 */
-    { string: _nl_C_LC_CTYPE_class32 },
+    { .string = _nl_C_LC_CTYPE_class32 },
     /* _NL_CTYPE_GAP3 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_CTYPE_GAP4 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_CTYPE_GAP5 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_CTYPE_GAP6 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_CTYPE_CLASS_NAMES */
-    { string: "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
+    { .string = "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
 	      "print\0" "graph\0" "blank\0" "cntrl\0" "punct\0"  "alnum\0"
 #ifdef PREDEFINED_CLASSES
 	      "left_to_right\0" "right_to_left\0" "num_terminator\0"
@@ -580,106 +580,106 @@ const struct locale_data _nl_C_LC_CTYPE attribute_hidden =
 #endif
     },
     /* _NL_CTYPE_MAP_NAMES */
-    { string: "toupper\0" "tolower\0"
+    { .string = "toupper\0" "tolower\0"
 #ifdef PREDEFINED_CLASSES
       "tosymmetric\0"
 #endif
     },
     /* _NL_CTYPE_WIDTH */
-    { string: (const char *) _nl_C_LC_CTYPE_width.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_width.header },
     /* _NL_CTYPE_MB_CUR_MAX */
-    { word: 1 },
+    { .word = 1 },
     /* _NL_CTYPE_CODESET_NAME */
-    { string: _nl_C_codeset },
+    { .string = _nl_C_codeset },
     /* _NL_CTYPE_TOUPPER32 */
-    { string: (const char *) &_nl_C_LC_CTYPE_toupper[128] },
+    { .string = (const char *) &_nl_C_LC_CTYPE_toupper[128] },
     /* _NL_CTYPE_TOLOWER32 */
-    { string: (const char *) &_nl_C_LC_CTYPE_tolower[128] },
+    { .string = (const char *) &_nl_C_LC_CTYPE_tolower[128] },
     /* _NL_CTYPE_CLASS_OFFSET */
-    { word: NR_FIXED },
+    { .word = NR_FIXED },
     /* _NL_CTYPE_MAP_OFFSET */
-    { word: NR_FIXED + NR_CLASSES },
+    { .word = NR_FIXED + NR_CLASSES },
     /* _NL_CTYPE_INDIGITS_MB_LEN */
-    { word: 1 },
+    { .word = 1 },
     /* _NL_CTYPE_INDIGITS0_MB .. _NL_CTYPE_INDIGITS9_MB */
-    { string: "0" },
-    { string: "1" },
-    { string: "2" },
-    { string: "3" },
-    { string: "4" },
-    { string: "5" },
-    { string: "6" },
-    { string: "7" },
-    { string: "8" },
-    { string: "9" },
+    { .string = "0" },
+    { .string = "1" },
+    { .string = "2" },
+    { .string = "3" },
+    { .string = "4" },
+    { .string = "5" },
+    { .string = "6" },
+    { .string = "7" },
+    { .string = "8" },
+    { .string = "9" },
     /* _NL_CTYPE_INDIGITS_WC_LEN */
-    { word: 1 },
+    { .word = 1 },
     /* _NL_CTYPE_INDIGITS0_WC .. _NL_CTYPE_INDIGITS9_WC */
-    { wstr: (uint32_t *) L"0" },
-    { wstr: (uint32_t *) L"1" },
-    { wstr: (uint32_t *) L"2" },
-    { wstr: (uint32_t *) L"3" },
-    { wstr: (uint32_t *) L"4" },
-    { wstr: (uint32_t *) L"5" },
-    { wstr: (uint32_t *) L"6" },
-    { wstr: (uint32_t *) L"7" },
-    { wstr: (uint32_t *) L"8" },
-    { wstr: (uint32_t *) L"9" },
+    { .wstr = (uint32_t *) L"0" },
+    { .wstr = (uint32_t *) L"1" },
+    { .wstr = (uint32_t *) L"2" },
+    { .wstr = (uint32_t *) L"3" },
+    { .wstr = (uint32_t *) L"4" },
+    { .wstr = (uint32_t *) L"5" },
+    { .wstr = (uint32_t *) L"6" },
+    { .wstr = (uint32_t *) L"7" },
+    { .wstr = (uint32_t *) L"8" },
+    { .wstr = (uint32_t *) L"9" },
     /* _NL_CTYPE_OUTDIGIT0_MB .. _NL_CTYPE_OUTDIGIT9_MB */
-    { string: "0" },
-    { string: "1" },
-    { string: "2" },
-    { string: "3" },
-    { string: "4" },
-    { string: "5" },
-    { string: "6" },
-    { string: "7" },
-    { string: "8" },
-    { string: "9" },
+    { .string = "0" },
+    { .string = "1" },
+    { .string = "2" },
+    { .string = "3" },
+    { .string = "4" },
+    { .string = "5" },
+    { .string = "6" },
+    { .string = "7" },
+    { .string = "8" },
+    { .string = "9" },
     /* _NL_CTYPE_OUTDIGIT0_WC .. _NL_CTYPE_OUTDIGIT9_WC */
-    { word: L'0' },
-    { word: L'1' },
-    { word: L'2' },
-    { word: L'3' },
-    { word: L'4' },
-    { word: L'5' },
-    { word: L'6' },
-    { word: L'7' },
-    { word: L'8' },
-    { word: L'9' },
+    { .word = L'0' },
+    { .word = L'1' },
+    { .word = L'2' },
+    { .word = L'3' },
+    { .word = L'4' },
+    { .word = L'5' },
+    { .word = L'6' },
+    { .word = L'7' },
+    { .word = L'8' },
+    { .word = L'9' },
     /* _NL_CTYPE_TRANSLIT_TAB_SIZE */
-    { word: NTRANSLIT },
+    { .word = NTRANSLIT },
     /* _NL_CTYPE_TRANSLIT_FROM_IDX */
-    { wstr: translit_from_idx },
+    { .wstr = translit_from_idx },
     /* _NL_CTYPE_TRANSLIT_FROM_TBL */
-    { wstr: (uint32_t *) translit_from_tbl },
+    { .wstr = (uint32_t *) translit_from_tbl },
     /* _NL_CTYPE_TRANSLIT_TO_IDX */
-    { wstr: translit_to_idx },
+    { .wstr = translit_to_idx },
     /* _NL_CTYPE_TRANSLIT_TO_TBL */
-    { wstr: (uint32_t *) translit_to_tbl },
+    { .wstr = (uint32_t *) translit_to_tbl },
     /* _NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN */
-    { word: 1 },
+    { .word = 1 },
     /* _NL_CTYPE_TRANSLIT_DEFAULT_MISSING */
-    { wstr: (uint32_t *) L"?" },
+    { .wstr = (uint32_t *) L"?" },
     /* _NL_CTYPE_TRANSLIT_IGNORE_LEN */
-    { word: 0 },
+    { .word = 0 },
     /* _NL_CTYPE_TRANSLIT_IGNORE */
-    { wstr: NULL },
+    { .wstr = NULL },
     /* NR_CLASSES wctype_tables */
-    { string: (const char *) _nl_C_LC_CTYPE_class_upper.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_lower.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_alpha.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_digit.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_xdigit.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_space.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_print.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_graph.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_blank.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_cntrl.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_punct.header },
-    { string: (const char *) _nl_C_LC_CTYPE_class_alnum.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_upper.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_lower.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_alpha.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_digit.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_xdigit.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_space.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_print.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_graph.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_blank.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_cntrl.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_punct.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_class_alnum.header },
     /* NR_MAPS wctrans_tables */
-    { string: (const char *) _nl_C_LC_CTYPE_map_toupper.header },
-    { string: (const char *) _nl_C_LC_CTYPE_map_tolower.header }
+    { .string = (const char *) _nl_C_LC_CTYPE_map_toupper.header },
+    { .string = (const char *) _nl_C_LC_CTYPE_map_tolower.header }
   }
 };
diff --git a/locale/C-identification.c b/locale/C-identification.c
index 1aceca0ea8..628e8f145d 100644
--- a/locale/C-identification.c
+++ b/locale/C-identification.c
@@ -33,25 +33,25 @@ const struct locale_data _nl_C_LC_IDENTIFICATION attribute_hidden =
   0,
   16,
   {
-    { string: "ISO/IEC 14652 i18n FDCC-set" },
-    { string: "ISO/IEC JTC1/SC22/WG20 - internationalization" },
-    { string: "C/o Keld Simonsen, Skt. Jorgens Alle 8, DK-1615 Kobenhavn V" },
-    { string: "Keld Simonsen" },
-    { string: "keld@dkuug.dk" },
-    { string: "+45 3122-6543" },
-    { string: "+45 3325-6543" },
-    { string: "" },
-    { string: "ISO" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "1.0" },
-    { string: "1997-12-20" },
-    { string: "i18n:1999\0" "i18n:1999\0" "i18n:1999\0" "i18n:1999\0"
+    { .string = "ISO/IEC 14652 i18n FDCC-set" },
+    { .string = "ISO/IEC JTC1/SC22/WG20 - internationalization" },
+    { .string = "C/o Keld Simonsen, Skt. Jorgens Alle 8, DK-1615 Kobenhavn V" },
+    { .string = "Keld Simonsen" },
+    { .string = "keld@dkuug.dk" },
+    { .string = "+45 3122-6543" },
+    { .string = "+45 3325-6543" },
+    { .string = "" },
+    { .string = "ISO" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "1.0" },
+    { .string = "1997-12-20" },
+    { .string = "i18n:1999\0" "i18n:1999\0" "i18n:1999\0" "i18n:1999\0"