summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog39
-rw-r--r--iconv/gconv_conf.c10
-rw-r--r--iconvdata/gap.awk4
-rw-r--r--iconvdata/gen-8bit-gap-1.sh2
-rw-r--r--iconvdata/gen-8bit-gap.sh2
-rw-r--r--locale/C-address.c26
-rw-r--r--locale/C-collate.c38
-rw-r--r--locale/C-ctype.c168
-rw-r--r--locale/C-identification.c32
-rw-r--r--locale/C-measurement.c4
-rw-r--r--locale/C-messages.c10
-rw-r--r--locale/C-monetary.c92
-rw-r--r--locale/C-name.c14
-rw-r--r--locale/C-numeric.c12
-rw-r--r--locale/C-paper.c6
-rw-r--r--locale/C-telephone.c10
-rw-r--r--locale/C-time.c222
-rw-r--r--stdio-common/vfprintf.c56
-rw-r--r--stdlib/random.c14
-rw-r--r--sysdeps/generic/siglist.c4
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h10
-rw-r--r--sysdeps/ieee754/bits/nan.h2
-rw-r--r--sysdeps/posix/sprofil.c12
-rw-r--r--sysdeps/unix/sysv/linux/sleep.c2
-rw-r--r--sysdeps/unix/sysv/linux/sysctl.c12
-rw-r--r--sysdeps/unix/sysv/linux/usleep.c4
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"
"i18n:1999\0" "i18n:1999\0" "\0" "i18n:1999\0"
"i18n:1999\0" "i18n:1999\0" "i18n:1999\0" "i18n:1999\0"
"i18n:1999\0" "i18n:1999\0" "i18n:1999\0" "i18n:1999\0"
"i18n:1999" },
- { string: _nl_C_codeset }
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-measurement.c b/locale/C-measurement.c
index 7b1fcac6d3..796fe29ce5 100644
--- a/locale/C-measurement.c
+++ b/locale/C-measurement.c
@@ -33,7 +33,7 @@ const struct locale_data _nl_C_LC_MEASUREMENT attribute_hidden =
0,
2,
{
- { string: "\1" },
- { string: _nl_C_codeset }
+ { .string = "\1" },
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-messages.c b/locale/C-messages.c
index 63f0c384cc..499d4bf5a6 100644
--- a/locale/C-messages.c
+++ b/locale/C-messages.c
@@ -33,10 +33,10 @@ const struct locale_data _nl_C_LC_MESSAGES attribute_hidden =
0,
5,
{
- { string: "^[yY]" },
- { string: "^[nN]" },
- { string: "" },
- { string: "" },
- { string: _nl_C_codeset }
+ { .string = "^[yY]" },
+ { .string = "^[nN]" },
+ { .string = "" },
+ { .string = "" },
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-monetary.c b/locale/C-monetary.c
index ce359e53b7..8cccf9637a 100644
--- a/locale/C-monetary.c
+++ b/locale/C-monetary.c
@@ -37,51 +37,51 @@ const struct locale_data _nl_C_LC_MONETARY attribute_hidden =
0,
46,
{
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: "-" },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: "" },
- { string: "" },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { string: not_available },
- { word: 10101 },
- { word: 99991231 },
- { word: 10101 },
- { word: 99991231 },
- { word: 1 },
- { word: (unsigned int) L'\0' },
- { word: (unsigned int) L'\0' },
- { string: _nl_C_codeset }
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = "-" },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = "" },
+ { .string = "" },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .string = not_available },
+ { .word = 10101 },
+ { .word = 99991231 },
+ { .word = 10101 },
+ { .word = 99991231 },
+ { .word = 1 },
+ { .word = (unsigned int) L'\0' },
+ { .word = (unsigned int) L'\0' },
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-name.c b/locale/C-name.c
index bea6e856e6..65033d6751 100644
--- a/locale/C-name.c
+++ b/locale/C-name.c
@@ -33,12 +33,12 @@ const struct locale_data _nl_C_LC_NAME attribute_hidden =
0,
7,
{
- { string: "%p%t%g%t%m%t%f" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: _nl_C_codeset }
+ { .string = "%p%t%g%t%m%t%f" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-numeric.c b/locale/C-numeric.c
index 3c53486c42..377c51cdfb 100644
--- a/locale/C-numeric.c
+++ b/locale/C-numeric.c
@@ -30,11 +30,11 @@ const struct locale_data _nl_C_LC_NUMERIC attribute_hidden =
0,
6,
{
- { string: "." },
- { string: "" },
- { string: "" },
- { word: (unsigned int) L'.' },
- { word: (unsigned int) L'\0' },
- { string: _nl_C_codeset }
+ { .string = "." },
+ { .string = "" },
+ { .string = "" },
+ { .word = (unsigned int) L'.' },
+ { .word = (unsigned int) L'\0' },
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-paper.c b/locale/C-paper.c
index 1a602a6755..74e6401de7 100644
--- a/locale/C-paper.c
+++ b/locale/C-paper.c
@@ -33,8 +33,8 @@ const struct locale_data _nl_C_LC_PAPER attribute_hidden =
0,
3,
{
- { word: 297 },
- { word: 210 },
- { string: _nl_C_codeset }
+ { .word = 297 },
+ { .word = 210 },
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-telephone.c b/locale/C-telephone.c
index 4bd81e789f..561a1ef28a 100644
--- a/locale/C-telephone.c
+++ b/locale/C-telephone.c
@@ -33,10 +33,10 @@ const struct locale_data _nl_C_LC_TELEPHONE attribute_hidden =
0,
5,
{
- { string: "+%c %a %l" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: _nl_C_codeset }
+ { .string = "+%c %a %l" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = _nl_C_codeset }
}
};
diff --git a/locale/C-time.c b/locale/C-time.c
index f638f948f3..a8534b1704 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -32,116 +32,116 @@ const struct locale_data _nl_C_LC_TIME attribute_hidden =
0,
111,
{
- { string: "Sun" },
- { string: "Mon" },
- { string: "Tue" },
- { string: "Wed" },
- { string: "Thu" },
- { string: "Fri" },
- { string: "Sat" },
- { string: "Sunday" },
- { string: "Monday" },
- { string: "Tuesday" },
- { string: "Wednesday" },
- { string: "Thursday" },
- { string: "Friday" },
- { string: "Saturday" },
- { string: "Jan" },
- { string: "Feb" },
- { string: "Mar" },
- { string: "Apr" },
- { string: "May" },
- { string: "Jun" },
- { string: "Jul" },
- { string: "Aug" },
- { string: "Sep" },
- { string: "Oct" },
- { string: "Nov" },
- { string: "Dec" },
- { string: "January" },
- { string: "February" },
- { string: "March" },
- { string: "April" },
- { string: "May" },
- { string: "June" },
- { string: "July" },
- { string: "August" },
- { string: "September" },
- { string: "October" },
- { string: "November" },
- { string: "December" },
- { string: "AM" },
- { string: "PM" },
- { string: "%a %b %e %H:%M:%S %Y" },
- { string: "%m/%d/%y" },
- { string: "%H:%M:%S" },
- { string: "%I:%M:%S %p" },
- { string: NULL },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { string: "" },
- { word: 0 },
- { string: "" },
- { wstr: (const uint32_t *) L"Sun" },
- { wstr: (const uint32_t *) L"Mon" },
- { wstr: (const uint32_t *) L"Tue" },
- { wstr: (const uint32_t *) L"Wed" },
- { wstr: (const uint32_t *) L"Thu" },
- { wstr: (const uint32_t *) L"Fri" },
- { wstr: (const uint32_t *) L"Sat" },
- { wstr: (const uint32_t *) L"Sunday" },
- { wstr: (const uint32_t *) L"Monday" },
- { wstr: (const uint32_t *) L"Tuesday" },
- { wstr: (const uint32_t *) L"Wednesday" },
- { wstr: (const uint32_t *) L"Thursday" },
- { wstr: (const uint32_t *) L"Friday" },
- { wstr: (const uint32_t *) L"Saturday" },
- { wstr: (const uint32_t *) L"Jan" },
- { wstr: (const uint32_t *) L"Feb" },
- { wstr: (const uint32_t *) L"Mar" },
- { wstr: (const uint32_t *) L"Apr" },
- { wstr: (const uint32_t *) L"May" },
- { wstr: (const uint32_t *) L"Jun" },
- { wstr: (const uint32_t *) L"Jul" },
- { wstr: (const uint32_t *) L"Aug" },
- { wstr: (const uint32_t *) L"Sep" },
- { wstr: (const uint32_t *) L"Oct" },
- { wstr: (const uint32_t *) L"Nov" },
- { wstr: (const uint32_t *) L"Dec" },
- { wstr: (const uint32_t *) L"January" },
- { wstr: (const uint32_t *) L"February" },
- { wstr: (const uint32_t *) L"March" },
- { wstr: (const uint32_t *) L"April" },
- { wstr: (const uint32_t *) L"May" },
- { wstr: (const uint32_t *) L"June" },
- { wstr: (const uint32_t *) L"July" },
- { wstr: (const uint32_t *) L"August" },
- { wstr: (const uint32_t *) L"September" },
- { wstr: (const uint32_t *) L"October" },
- { wstr: (const uint32_t *) L"November" },
- { wstr: (const uint32_t *) L"December" },
- { wstr: (const uint32_t *) L"AM" },
- { wstr: (const uint32_t *) L"PM" },
- { wstr: (const uint32_t *) L"%a %b %e %H:%M:%S %Y" },
- { wstr: (const uint32_t *) L"%m/%d/%y" },
- { wstr: (const uint32_t *) L"%H:%M:%S" },
- { wstr: (const uint32_t *) L"%I:%M:%S %p" },
- { wstr: (const uint32_t *) L"" },
- { wstr: (const uint32_t *) L"" },
- { wstr: (const uint32_t *) L"" },
- { wstr: (const uint32_t *) L"" },
- { wstr: (const uint32_t *) L"" },
- { string: "\7" },
- { word: 19971130 },
- { string: "\4" },
- { string: "\7" },
- { string: "\1" },
- { string: "\1" },
- { string: "" },
- { string: "%a %b %e %H:%M:%S %Z %Y" },
- { wstr: (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
- { string: _nl_C_codeset }
+ { .string = "Sun" },
+ { .string = "Mon" },
+ { .string = "Tue" },
+ { .string = "Wed" },
+ { .string = "Thu" },
+ { .string = "Fri" },
+ { .string = "Sat" },
+ { .string = "Sunday" },
+ { .string = "Monday" },
+ { .string = "Tuesday" },
+ { .string = "Wednesday" },
+ { .string = "Thursday" },
+ { .string = "Friday" },
+ { .string = "Saturday" },
+ { .string = "Jan" },
+ { .string = "Feb" },
+ { .string = "Mar" },
+ { .string = "Apr" },
+ { .string = "May" },
+ { .string = "Jun" },
+ { .string = "Jul" },
+ { .string = "Aug" },
+ { .string = "Sep" },
+ { .string = "Oct" },
+ { .string = "Nov" },
+ { .string = "Dec" },
+ { .string = "January" },
+ { .string = "February" },
+ { .string = "March" },
+ { .string = "April" },
+ { .string = "May" },
+ { .string = "June" },
+ { .string = "July" },
+ { .string = "August" },
+ { .string = "September" },
+ { .string = "October" },
+ { .string = "November" },
+ { .string = "December" },
+ { .string = "AM" },
+ { .string = "PM" },
+ { .string = "%a %b %e %H:%M:%S %Y" },
+ { .string = "%m/%d/%y" },
+ { .string = "%H:%M:%S" },
+ { .string = "%I:%M:%S %p" },
+ { .string = NULL },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .string = "" },
+ { .word = 0 },
+ { .string = "" },
+ { .wstr = (const uint32_t *) L"Sun" },
+ { .wstr = (const uint32_t *) L"Mon" },
+ { .wstr = (const uint32_t *) L"Tue" },
+ { .wstr = (const uint32_t *) L"Wed" },
+ { .wstr = (const uint32_t *) L"Thu" },
+ { .wstr = (const uint32_t *) L"Fri" },
+ { .wstr = (const uint32_t *) L"Sat" },
+ { .wstr = (const uint32_t *) L"Sunday" },
+ { .wstr = (const uint32_t *) L"Monday" },
+ { .wstr = (const uint32_t *) L"Tuesday" },
+ { .wstr = (const uint32_t *) L"Wednesday" },
+ { .wstr = (const uint32_t *) L"Thursday" },
+ { .wstr = (const uint32_t *) L"Friday" },
+ { .wstr = (const uint32_t *) L"Saturday" },
+ { .wstr = (const uint32_t *) L"Jan" },
+ { .wstr = (const uint32_t *) L"Feb" },
+ { .wstr = (const uint32_t *) L"Mar" },
+ { .wstr = (const uint32_t *) L"Apr" },
+ { .wstr = (const uint32_t *) L"May" },
+ { .wstr = (const uint32_t *) L"Jun" },
+ { .wstr = (const uint32_t *) L"Jul" },
+ { .wstr = (const uint32_t *) L"Aug" },
+ { .wstr = (const uint32_t *) L"Sep" },
+ { .wstr = (const uint32_t *) L"Oct" },
+ { .wstr = (const uint32_t *) L"Nov" },
+ { .wstr = (const uint32_t *) L"Dec" },
+ { .wstr = (const uint32_t *) L"January" },
+ { .wstr = (const uint32_t *) L"February" },
+ { .wstr = (const uint32_t *) L"March" },
+ { .wstr = (const uint32_t *) L"April" },
+ { .wstr = (const uint32_t *) L"May" },
+ { .wstr = (const uint32_t *) L"June" },
+ { .wstr = (const uint32_t *) L"July" },
+ { .wstr = (const uint32_t *) L"August" },
+ { .wstr = (const uint32_t *) L"September" },
+ { .wstr = (const uint32_t *) L"October" },
+ { .wstr = (const uint32_t *) L"November" },
+ { .wstr = (const uint32_t *) L"December" },
+ { .wstr = (const uint32_t *) L"AM" },
+ { .wstr = (const uint32_t *) L"PM" },
+ { .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Y" },
+ { .wstr = (const uint32_t *) L"%m/%d/%y" },
+ { .wstr = (const uint32_t *) L"%H:%M:%S" },
+ { .wstr = (const uint32_t *) L"%I:%M:%S %p" },
+ { .wstr = (const uint32_t *) L"" },
+ { .wstr = (const uint32_t *) L"" },
+ { .wstr = (const uint32_t *) L"" },
+ { .wstr = (const uint32_t *) L"" },
+ { .wstr = (const uint32_t *) L"" },
+ { .string = "\7" },
+ { .word = 19971130 },
+ { .string = "\4" },
+ { .string = "\7" },
+ { .string = "\1" },
+ { .string = "\1" },
+ { .string = "" },
+ { .string = "%a %b %e %H:%M:%S %Z %Y" },
+ { .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
+ { .string = _nl_C_codeset }
}
};
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 4f9cd9b424..a5902164ee 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -806,20 +806,20 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
\
if (fspec == NULL) \
{ \
- struct printf_info info = { prec: prec, \
- width: width, \
- spec: spec, \
- is_long_double: is_long_double, \
- is_short: is_short, \
- is_long: is_long, \
- alt: alt, \
- space: space, \
- left: left, \
- showsign: showsign, \
- group: group, \
- pad: pad, \
- extra: 0, \
- wide: sizeof (CHAR_T) != 1 }; \
+ struct printf_info info = { .prec = prec, \
+ .width = width, \
+ .spec = spec, \
+ .is_long_double = is_long_double, \
+ .is_short = is_short, \
+ .is_long = is_long, \
+ .alt = alt, \
+ .space = space, \
+ .left = left, \
+ .showsign = showsign, \
+ .group = group, \
+ .pad = pad, \
+ .extra = 0, \
+ .wide = sizeof (CHAR_T) != 1 }; \
\
if (is_long_double) \
the_arg.pa_long_double = va_arg (ap, long double); \
@@ -855,20 +855,20 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
\
if (fspec == NULL) \
{ \
- struct printf_info info = { prec: prec, \
- width: width, \
- spec: spec, \
- is_long_double: is_long_double, \
- is_short: is_short, \
- is_long: is_long, \
- alt: alt, \
- space: space, \
- left: left, \
- showsign: showsign, \
- group: group, \
- pad: pad, \
- extra: 0, \
- wide: sizeof (CHAR_T) != 1 }; \
+ struct printf_info info = { .prec = prec, \
+ .width = width, \
+ .spec = spec, \
+ .is_long_double = is_long_double, \
+ .is_short = is_short, \
+ .is_long = is_long, \
+ .alt = alt, \
+ .space = space, \
+ .left = left, \
+ .showsign = showsign, \
+ .group = group, \
+ .pad = pad, \
+ .extra = 0, \
+ .wide = sizeof (CHAR_T) != 1 }; \
\
if (is_long_double) \
the_arg.pa_long_double = va_arg (ap, long double); \
diff --git a/stdlib/random.c b/stdlib/random.c
index f09661de28..8a32ee7103 100644
--- a/stdlib/random.c
+++ b/stdlib/random.c
@@ -170,8 +170,8 @@ static struct random_data unsafe_state =
in the initialization of randtbl) because the state table pointer is set
to point to randtbl[1] (as explained below).) */
- fptr : &randtbl[SEP_3 + 1],
- rptr : &randtbl[1],
+ .fptr = &randtbl[SEP_3 + 1],
+ .rptr = &randtbl[1],
/* The following things are the pointer to the state information table,
the type of the current generator, the degree of the current polynomial
@@ -183,13 +183,13 @@ static struct random_data unsafe_state =
indexing every time to find the address of the last element to see if
the front and rear pointers have wrapped. */
- state : &randtbl[1],
+ .state = &randtbl[1],
- rand_type : TYPE_3,
- rand_deg : DEG_3,
- rand_sep : SEP_3,
+ .rand_type = TYPE_3,
+ .rand_deg = DEG_3,
+ .rand_sep = SEP_3,
- end_ptr : &randtbl[sizeof (randtbl) / sizeof (randtbl[0])]
+ .end_ptr = &randtbl[sizeof (randtbl) / sizeof (randtbl[0])]
};
/* POSIX.1c requires that there is mutual exclusion for the `rand' and
diff --git a/sysdeps/generic/siglist.c b/sysdeps/generic/siglist.c
index b7b48a786b..80847cd491 100644
--- a/sysdeps/generic/siglist.c
+++ b/sysdeps/generic/siglist.c
@@ -23,7 +23,7 @@
const char *const _sys_siglist[NSIG] =
{
-#define init_sig(sig, abbrev, desc) [sig] desc,
+#define init_sig(sig, abbrev, desc) [sig] = desc,
#include <siglist.h>
#undef init_sig
};
@@ -32,7 +32,7 @@ strong_alias (_sys_siglist, _sys_siglist_internal)
const char *const _sys_sigabbrev[NSIG] =
{
-#define init_sig(sig, abbrev, desc) [sig] abbrev,
+#define init_sig(sig, abbrev, desc) [sig] = abbrev,
#include <siglist.h>
#undef init_sig
};
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index e8091df684..88a8f77aa1 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -127,19 +127,19 @@
__MATH_INLINE int
__signbitf (float __x) __THROW
{
- __extension__ union { float __f; int __i; } __u = { __f: __x };
+ __extension__ union { float __f; int __i; } __u = { .__f = __x };
return __u.__i < 0;
}
__MATH_INLINE int
__signbit (double __x) __THROW
{
- __extension__ union { double __d; int __i[2]; } __u = { __d: __x };
+ __extension__ union { double __d; int __i[2]; } __u = { .__d = __x };
return __u.__i[1] < 0;
}
__MATH_INLINE int
__signbitl (long double __x) __THROW
{
- __extension__ union { long double __l; int __i[3]; } __u = { __l: __x };
+ __extension__ union { long double __l; int __i[3]; } __u = { .__l = __x };
return (__u.__i[2] & 0x8000) != 0;
}
# endif
@@ -467,7 +467,7 @@ __inline_mathop_declNP (atan, "fld1; fpatan", "0" (__x) : "st(1)")
__inline_mathcode_ (long double, __sgn1l, __x, \
__extension__ union { long double __xld; unsigned int __xi[3]; } __n = \
- { __xld: __x }; \
+ { .__xld = __x }; \
__n.__xi[2] = (__n.__xi[2] & 0x8000) | 0x3fff; \
__n.__xi[1] = 0x80000000; \
__n.__xi[0] = 0; \
@@ -666,7 +666,7 @@ __MATH_INLINE int
__finite (double __x) __THROW
{
return (__extension__
- (((((union { double __d; int __i[2]; }) {__d: __x}).__i[1]
+ (((((union { double __d; int __i[2]; }) {.__d = __x}).__i[1]
| 0x800fffffu) + 1) >> 31));
}
diff --git a/sysdeps/ieee754/bits/nan.h b/sysdeps/ieee754/bits/nan.h
index 6d88b551b1..251b14de0b 100644
--- a/sysdeps/ieee754/bits/nan.h
+++ b/sysdeps/ieee754/bits/nan.h
@@ -29,7 +29,7 @@
# define NAN \
(__extension__ \
((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; }) \
- { __l: 0x7fc00000UL }).__d)
+ { .__l = 0x7fc00000UL }).__d)
#else
diff --git a/sysdeps/posix/sprofil.c b/sysdeps/posix/sprofil.c
index 8f3270e1fc..afb6d2f84e 100644
--- a/sysdeps/posix/sprofil.c
+++ b/sysdeps/posix/sprofil.c
@@ -61,12 +61,12 @@ static unsigned int overflow_counter;
static struct region default_overflow_region =
{
- offset: 0,
- nsamples: 1,
- scale: 2,
- sample: { &overflow_counter },
- start: 0,
- end: ~(size_t) 0
+ .offset = 0,
+ .nsamples = 1,
+ .scale = 2,
+ .sample = { &overflow_counter },
+ .start = 0,
+ .end = ~(size_t) 0
};
static struct prof_info prof_info;
diff --git a/sysdeps/unix/sysv/linux/sleep.c b/sysdeps/unix/sysv/linux/sleep.c
index b73032263b..0cf6be285d 100644
--- a/sysdeps/unix/sysv/linux/sleep.c
+++ b/sysdeps/unix/sysv/linux/sleep.c
@@ -29,7 +29,7 @@
unsigned int
__sleep (unsigned int seconds)
{
- struct timespec ts = { tv_sec: (long int) seconds, tv_nsec: 0 };
+ struct timespec ts = { .tv_sec = (long int) seconds, .tv_nsec = 0 };
sigset_t set, oset;
unsigned int result;
diff --git a/sysdeps/unix/sysv/linux/sysctl.c b/sysdeps/unix/sysv/linux/sysctl.c
index c31eaaebcf..ee5b30a7b0 100644
--- a/sysdeps/unix/sysv/linux/sysctl.c
+++ b/sysdeps/unix/sysv/linux/sysctl.c
@@ -33,12 +33,12 @@ __sysctl (int *name, int nlen, void *oldval, size_t *oldlenp,
/* GKM FIXME: force __sysctl_args decl to have unbounded pointers. */
struct __sysctl_args args =
{
- name: name,
- nlen: nlen,
- oldval: oldval,
- oldlenp: oldlenp,
- newval: newval,
- newlen: newlen
+ .name = name,
+ .nlen = nlen,
+ .oldval = oldval,
+ .oldlenp = oldlenp,
+ .newval = newval,
+ .newlen = newlen
};
(void) CHECK_N (name, nlen);
(void) CHECK_N (oldval, *oldlenp);
diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c
index 1aae404098..643429eade 100644
--- a/sysdeps/unix/sysv/linux/usleep.c
+++ b/sysdeps/unix/sysv/linux/usleep.c
@@ -24,8 +24,8 @@
int
usleep (useconds_t useconds)
{
- struct timespec ts = { tv_sec: (long int) (useconds / 1000000),
- tv_nsec: (long int) (useconds % 1000000) * 1000ul };
+ struct timespec ts = { .tv_sec = (long int) (useconds / 1000000),
+ .tv_nsec = (long int) (useconds % 1000000) * 1000ul };
return __nanosleep (&ts, NULL);
}