Update.

2002-12-19  Jakub Jelinek  <jakub@redhat.com>

	* nscd/connections.c (nscd_run): Shut up warning.
	* tst-ungetc.c (assert): Undefined before redefining.

2002-12-19  Ulrich Drepper  <drepper@redhat.com>

	* posix/regex.c: Use __builtin_expect even outside glibc if gcc 3
	is used.

2002-12-17  Art Haas  <ahaas@airmail.net>

	* iconvdata/cp737.h: Convert GCC extension initializer syntax to C99.
	* iconvdata/cp775.h: Likewise.
	* iconvdata/ibm1046.h: Likewise.
	* iconvdata/ibm1124.h: Likewise.
	* iconvdata/ibm1129.h: Likewise.
	* iconvdata/ibm1132.h: Likewise.
	* iconvdata/ibm1133.h: Likewise.
	* iconvdata/ibm1160.h: Likewise.
	* iconvdata/ibm1161.h: Likewise.
	* iconvdata/ibm1162.h: Likewise.
	* iconvdata/ibm1163.h: Likewise.
	* iconvdata/ibm1164.h: Likewise.

	(__ASSUME_CLONE_THREAD_FLAGS): Define for x86 and kernel >= 2.5.50.

21 files changed, 181 insertions, 148 deletions

diff --git a/ChangeLog b/ChangeLog
index be2b655..c6943cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,34 @@
+2002-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* nscd/connections.c (nscd_run): Shut up warning.
+	* tst-ungetc.c (assert): Undefined before redefining.
+
+2002-12-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/regex.c: Use __builtin_expect even outside glibc if gcc 3
+	is used.
+
+2002-12-17  Art Haas  <ahaas@airmail.net>
+
+	* iconvdata/cp737.h: Convert GCC extension initializer syntax to C99.
+	* iconvdata/cp775.h: Likewise.
+	* iconvdata/ibm1046.h: Likewise.
+	* iconvdata/ibm1124.h: Likewise.
+	* iconvdata/ibm1129.h: Likewise.
+	* iconvdata/ibm1132.h: Likewise.
+	* iconvdata/ibm1133.h: Likewise.
+	* iconvdata/ibm1160.h: Likewise.
+	* iconvdata/ibm1161.h: Likewise.
+	* iconvdata/ibm1162.h: Likewise.
+	* iconvdata/ibm1163.h: Likewise.
+	* iconvdata/ibm1164.h: Likewise.
+
 2002-12-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/system.c: Define FORK only if
 	__ASSUME_CLONE_THREAD_FLAGS is defined.
 	* sysdeps/unix/sysv/linux/kernel-features.h
-	(__ASSUME_CLONE_THREAD_FLAGS): Define for x86 and kernel >=
-	2.5.50.
+	(__ASSUME_CLONE_THREAD_FLAGS): Define for x86 and kernel >= 2.5.50.
 
 2002-12-18  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/iconvdata/cp737.h b/iconvdata/cp737.h
index 59d6f02..3df494f 100644
--- a/iconvdata/cp737.h
+++ b/iconvdata/cp737.h
@@ -1,5 +1,5 @@
 /* Mapping table for CP737.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -295,25 +295,25 @@ static const uint32_t to_ucs4[256] =
  */
 static struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x007f, idx:     0 },
-  { start: 0x00a0, end: 0x00a0, idx:   -32 },
-  { start: 0x00b0, end: 0x00b7, idx:   -47 },
-  { start: 0x00f7, end: 0x00f7, idx:  -110 },
-  { start: 0x0386, end: 0x03ce, idx:  -764 },
-  { start: 0x207f, end: 0x207f, idx: -8108 },
-  { start: 0x2219, end: 0x221a, idx: -8517 },
-  { start: 0x2248, end: 0x2248, idx: -8562 },
-  { start: 0x2264, end: 0x2265, idx: -8589 },
-  { start: 0x2500, end: 0x2502, idx: -9255 },
-  { start: 0x250c, end: 0x251c, idx: -9264 },
-  { start: 0x2524, end: 0x2524, idx: -9271 },
-  { start: 0x252c, end: 0x252c, idx: -9278 },
-  { start: 0x2534, end: 0x2534, idx: -9285 },
-  { start: 0x253c, end: 0x253c, idx: -9292 },
-  { start: 0x2550, end: 0x256c, idx: -9311 },
-  { start: 0x2580, end: 0x2593, idx: -9330 },
-  { start: 0x25a0, end: 0x25a0, idx: -9342 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x007f, .idx =     0 },
+  { .start = 0x00a0, .end = 0x00a0, .idx =   -32 },
+  { .start = 0x00b0, .end = 0x00b7, .idx =   -47 },
+  { .start = 0x00f7, .end = 0x00f7, .idx =  -110 },
+  { .start = 0x0386, .end = 0x03ce, .idx =  -764 },
+  { .start = 0x207f, .end = 0x207f, .idx = -8108 },
+  { .start = 0x2219, .end = 0x221a, .idx = -8517 },
+  { .start = 0x2248, .end = 0x2248, .idx = -8562 },
+  { .start = 0x2264, .end = 0x2265, .idx = -8589 },
+  { .start = 0x2500, .end = 0x2502, .idx = -9255 },
+  { .start = 0x250c, .end = 0x251c, .idx = -9264 },
+  { .start = 0x2524, .end = 0x2524, .idx = -9271 },
+  { .start = 0x252c, .end = 0x252c, .idx = -9278 },
+  { .start = 0x2534, .end = 0x2534, .idx = -9285 },
+  { .start = 0x253c, .end = 0x253c, .idx = -9292 },
+  { .start = 0x2550, .end = 0x256c, .idx = -9311 },
+  { .start = 0x2580, .end = 0x2593, .idx = -9330 },
+  { .start = 0x25a0, .end = 0x25a0, .idx = -9342 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 /* Table accessed through above index table.  It can be generated using:
diff --git a/iconvdata/cp775.h b/iconvdata/cp775.h
index f672c7c..3b15ad7 100644
--- a/iconvdata/cp775.h
+++ b/iconvdata/cp775.h
@@ -1,5 +1,5 @@
 /* Mapping table for CP775.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -295,28 +295,28 @@ static const uint32_t to_ucs4[256] =
  */
 static struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x007f, idx:     0 },
-  { start: 0x00a0, end: 0x00c9, idx:   -32 },
-  { start: 0x00d3, end: 0x00e9, idx:   -41 },
-  { start: 0x00f3, end: 0x0119, idx:   -50 },
-  { start: 0x0122, end: 0x0123, idx:   -58 },
-  { start: 0x012a, end: 0x012f, idx:   -64 },
-  { start: 0x0136, end: 0x014d, idx:   -70 },
-  { start: 0x0156, end: 0x0161, idx:   -78 },
-  { start: 0x016a, end: 0x016b, idx:   -86 },
-  { start: 0x0172, end: 0x017e, idx:   -92 },
-  { start: 0x2019, end: 0x201e, idx: -7926 },
-  { start: 0x2219, end: 0x2219, idx: -8432 },
-  { start: 0x2500, end: 0x2502, idx: -9174 },
-  { start: 0x250c, end: 0x251c, idx: -9183 },
-  { start: 0x2524, end: 0x2524, idx: -9190 },
-  { start: 0x252c, end: 0x252c, idx: -9197 },
-  { start: 0x2534, end: 0x2534, idx: -9204 },
-  { start: 0x253c, end: 0x253c, idx: -9211 },
-  { start: 0x2550, end: 0x256c, idx: -9230 },
-  { start: 0x2580, end: 0x2593, idx: -9249 },
-  { start: 0x25a0, end: 0x25a0, idx: -9261 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x007f, .idx =     0 },
+  { .start = 0x00a0, .end = 0x00c9, .idx =   -32 },
+  { .start = 0x00d3, .end = 0x00e9, .idx =   -41 },
+  { .start = 0x00f3, .end = 0x0119, .idx =   -50 },
+  { .start = 0x0122, .end = 0x0123, .idx =   -58 },
+  { .start = 0x012a, .end = 0x012f, .idx =   -64 },
+  { .start = 0x0136, .end = 0x014d, .idx =   -70 },
+  { .start = 0x0156, .end = 0x0161, .idx =   -78 },
+  { .start = 0x016a, .end = 0x016b, .idx =   -86 },
+  { .start = 0x0172, .end = 0x017e, .idx =   -92 },
+  { .start = 0x2019, .end = 0x201e, .idx = -7926 },
+  { .start = 0x2219, .end = 0x2219, .idx = -8432 },
+  { .start = 0x2500, .end = 0x2502, .idx = -9174 },
+  { .start = 0x250c, .end = 0x251c, .idx = -9183 },
+  { .start = 0x2524, .end = 0x2524, .idx = -9190 },
+  { .start = 0x252c, .end = 0x252c, .idx = -9197 },
+  { .start = 0x2534, .end = 0x2534, .idx = -9204 },
+  { .start = 0x253c, .end = 0x253c, .idx = -9211 },
+  { .start = 0x2550, .end = 0x256c, .idx = -9230 },
+  { .start = 0x2580, .end = 0x2593, .idx = -9249 },
+  { .start = 0x25a0, .end = 0x25a0, .idx = -9261 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 /* Table accessed through above index table.  It can be generated using:
diff --git a/iconvdata/ibm1046.h b/iconvdata/ibm1046.h
index fe7d1f0..2441691 100644
--- a/iconvdata/ibm1046.h
+++ b/iconvdata/ibm1046.h
@@ -1,5 +1,5 @@
 /* Tables for conversion from and to IBM1046.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000.
 
@@ -88,31 +88,31 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x007f, idx:      0 },
-  { start: 0x0088, end: 0x0088, idx:     -8 },
-  { start: 0x00a0, end: 0x00a0, idx:    -31 },
-  { start: 0x00a4, end: 0x00a4, idx:    -34 },
-  { start: 0x00ad, end: 0x00ad, idx:    -42 },
-  { start: 0x00d7, end: 0x00d7, idx:    -83 },
-  { start: 0x00f7, end: 0x00f7, idx:   -114 },
-  { start: 0x060c, end: 0x060c, idx:  -1414 },
-  { start: 0x061b, end: 0x061b, idx:  -1428 },
-  { start: 0x061f, end: 0x061f, idx:  -1431 },
-  { start: 0x0621, end: 0x063a, idx:  -1432 },
-  { start: 0x0640, end: 0x0652, idx:  -1437 },
-  { start: 0x0660, end: 0x066d, idx:  -1450 },
-  { start: 0x200b, end: 0x200b, idx:  -8007 },
-  { start: 0x2500, end: 0x2500, idx:  -9275 },
-  { start: 0x2502, end: 0x2502, idx:  -9276 },
-  { start: 0x250c, end: 0x250c, idx:  -9285 },
-  { start: 0x2510, end: 0x2510, idx:  -9288 },
-  { start: 0x2514, end: 0x2514, idx:  -9291 },
-  { start: 0x2518, end: 0x2518, idx:  -9294 },
-  { start: 0x25a0, end: 0x25a0, idx:  -9429 },
-  { start: 0xfe70, end: 0xfe72, idx: -64932 },
-  { start: 0xfe74, end: 0xfe74, idx: -64933 },
-  { start: 0xfe76, end: 0xfefc, idx: -64934 },
-  { start: 0xffff, end: 0xffff, idx:      0 }
+  { .start = 0x0000, .end = 0x007f, .idx =      0 },
+  { .start = 0x0088, .end = 0x0088, .idx =     -8 },
+  { .start = 0x00a0, .end = 0x00a0, .idx =    -31 },
+  { .start = 0x00a4, .end = 0x00a4, .idx =    -34 },
+  { .start = 0x00ad, .end = 0x00ad, .idx =    -42 },
+  { .start = 0x00d7, .end = 0x00d7, .idx =    -83 },
+  { .start = 0x00f7, .end = 0x00f7, .idx =   -114 },
+  { .start = 0x060c, .end = 0x060c, .idx =  -1414 },
+  { .start = 0x061b, .end = 0x061b, .idx =  -1428 },
+  { .start = 0x061f, .end = 0x061f, .idx =  -1431 },
+  { .start = 0x0621, .end = 0x063a, .idx =  -1432 },
+  { .start = 0x0640, .end = 0x0652, .idx =  -1437 },
+  { .start = 0x0660, .end = 0x066d, .idx =  -1450 },
+  { .start = 0x200b, .end = 0x200b, .idx =  -8007 },
+  { .start = 0x2500, .end = 0x2500, .idx =  -9275 },
+  { .start = 0x2502, .end = 0x2502, .idx =  -9276 },
+  { .start = 0x250c, .end = 0x250c, .idx =  -9285 },
+  { .start = 0x2510, .end = 0x2510, .idx =  -9288 },
+  { .start = 0x2514, .end = 0x2514, .idx =  -9291 },
+  { .start = 0x2518, .end = 0x2518, .idx =  -9294 },
+  { .start = 0x25a0, .end = 0x25a0, .idx =  -9429 },
+  { .start = 0xfe70, .end = 0xfe72, .idx = -64932 },
+  { .start = 0xfe74, .end = 0xfe74, .idx = -64933 },
+  { .start = 0xfe76, .end = 0xfefc, .idx = -64934 },
+  { .start = 0xffff, .end = 0xffff, .idx =      0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1124.h b/iconvdata/ibm1124.h
index d3f0b84..8cf998f 100644
--- a/iconvdata/ibm1124.h
+++ b/iconvdata/ibm1124.h
@@ -1,5 +1,5 @@
 /* Conversion from and to IBM1124.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
 
@@ -88,12 +88,12 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x00a0, idx:     0 },
-  { start: 0x00a7, end: 0x00ad, idx:    -6 },
-  { start: 0x0401, end: 0x045f, idx:  -857 },
-  { start: 0x0490, end: 0x0491, idx:  -905 },
-  { start: 0x2116, end: 0x2116, idx: -8205 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x00a0, .idx =     0 },
+  { .start = 0x00a7, .end = 0x00ad, .idx =    -6 },
+  { .start = 0x0401, .end = 0x045f, .idx =  -857 },
+  { .start = 0x0490, .end = 0x0491, .idx =  -905 },
+  { .start = 0x2116, .end = 0x2116, .idx = -8205 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1129.h b/iconvdata/ibm1129.h
index 4d340df..a9cbb0f 100644
--- a/iconvdata/ibm1129.h
+++ b/iconvdata/ibm1129.h
@@ -1,5 +1,5 @@
 /* Conversion from and to IBM1129.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
 
@@ -88,16 +88,16 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x0103, idx:     0 },
-  { start: 0x0110, end: 0x0111, idx:   -12 },
-  { start: 0x0152, end: 0x0153, idx:   -76 },
-  { start: 0x0178, end: 0x0178, idx:  -112 },
-  { start: 0x01a0, end: 0x01a1, idx:  -151 },
-  { start: 0x01af, end: 0x01b0, idx:  -164 },
-  { start: 0x0300, end: 0x0309, idx:  -499 },
-  { start: 0x0323, end: 0x0323, idx:  -524 },
-  { start: 0x20ab, end: 0x20ab, idx: -8083 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x0103, .idx =     0 },
+  { .start = 0x0110, .end = 0x0111, .idx =   -12 },
+  { .start = 0x0152, .end = 0x0153, .idx =   -76 },
+  { .start = 0x0178, .end = 0x0178, .idx =  -112 },
+  { .start = 0x01a0, .end = 0x01a1, .idx =  -151 },
+  { .start = 0x01af, .end = 0x01b0, .idx =  -164 },
+  { .start = 0x0300, .end = 0x0309, .idx =  -499 },
+  { .start = 0x0323, .end = 0x0323, .idx =  -524 },
+  { .start = 0x20ab, .end = 0x20ab, .idx = -8083 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1132.h b/iconvdata/ibm1132.h
index b95e4be..b454595 100644
--- a/iconvdata/ibm1132.h
+++ b/iconvdata/ibm1132.h
@@ -1,5 +1,5 @@
 /* Mapping table for IBM1132.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
 
@@ -82,10 +82,10 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x00ac, idx:     0 },
-  { start: 0x0e81, end: 0x0e8d, idx: -3540 },
-  { start: 0x0e94, end: 0x0edd, idx: -3546 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x00ac, .idx =     0 },
+  { .start = 0x0e81, .end = 0x0e8d, .idx = -3540 },
+  { .start = 0x0e94, .end = 0x0edd, .idx = -3546 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1133.h b/iconvdata/ibm1133.h
index 7939ecf..d438cc0 100644
--- a/iconvdata/ibm1133.h
+++ b/iconvdata/ibm1133.h
@@ -1,5 +1,5 @@
 /* Mapping table for IBM1133.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
 
@@ -82,10 +82,10 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x00ac, idx:     0 },
-  { start: 0x0e81, end: 0x0e8d, idx: -3540 },
-  { start: 0x0e94, end: 0x0edd, idx: -3546 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x00ac, .idx =     0 },
+  { .start = 0x0e81, .end = 0x0e8d, .idx = -3540 },
+  { .start = 0x0e94, .end = 0x0edd, .idx = -3546 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1160.h b/iconvdata/ibm1160.h
index 7bc8934..37b4963 100644
--- a/iconvdata/ibm1160.h
+++ b/iconvdata/ibm1160.h
@@ -1,5 +1,5 @@
 /* Mapping table for IBM1160.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
 
@@ -88,10 +88,10 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x00ac, idx:     0 },
-  { start: 0x0e01, end: 0x0e5b, idx: -3412 },
-  { start: 0x20ac, end: 0x20ac, idx: -8100 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x00ac, .idx =     0 },
+  { .start = 0x0e01, .end = 0x0e5b, .idx = -3412 },
+  { .start = 0x20ac, .end = 0x20ac, .idx = -8100 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1161.h b/iconvdata/ibm1161.h
index b29f5c4..3c71a40 100644
--- a/iconvdata/ibm1161.h
+++ b/iconvdata/ibm1161.h
@@ -1,5 +1,5 @@
 /* Mapping table for IBM1161.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
 
@@ -80,11 +80,11 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x007f, idx:     0 },
-  { start: 0x00a0, end: 0x00ac, idx:   -32 },
-  { start: 0x0e01, end: 0x0e5b, idx: -3444 },
-  { start: 0x20ac, end: 0x20ac, idx: -8132 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x007f, .idx =     0 },
+  { .start = 0x00a0, .end = 0x00ac, .idx =   -32 },
+  { .start = 0x0e01, .end = 0x0e5b, .idx = -3444 },
+  { .start = 0x20ac, .end = 0x20ac, .idx = -8132 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1162.h b/iconvdata/ibm1162.h
index 833cada..4ddc83c 100644
--- a/iconvdata/ibm1162.h
+++ b/iconvdata/ibm1162.h
@@ -1,5 +1,5 @@
 /* Mapping table for IBM1162.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
 
@@ -86,12 +86,12 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x0090, idx:     0 },
-  { start: 0x0098, end: 0x00a0, idx:    -7 },
-  { start: 0x0e01, end: 0x0e5b, idx: -3431 },
-  { start: 0x2013, end: 0x2026, idx: -7966 },
-  { start: 0x20ac, end: 0x20ac, idx: -8099 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x0090, .idx =     0 },
+  { .start = 0x0098, .end = 0x00a0, .idx =    -7 },
+  { .start = 0x0e01, .end = 0x0e5b, .idx = -3431 },
+  { .start = 0x2013, .end = 0x2026, .idx = -7966 },
+  { .start = 0x20ac, .end = 0x20ac, .idx = -8099 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1163.h b/iconvdata/ibm1163.h
index adb031a..575e4f4 100644
--- a/iconvdata/ibm1163.h
+++ b/iconvdata/ibm1163.h
@@ -1,5 +1,5 @@
 /* Mapping table for IBM1163.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
 
@@ -88,17 +88,17 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x0103, idx:     0 },
-  { start: 0x0110, end: 0x0111, idx:   -12 },
-  { start: 0x0152, end: 0x0153, idx:   -76 },
-  { start: 0x0178, end: 0x0178, idx:  -112 },
-  { start: 0x01a0, end: 0x01a1, idx:  -151 },
-  { start: 0x01af, end: 0x01b0, idx:  -164 },
-  { start: 0x0300, end: 0x0309, idx:  -499 },
-  { start: 0x0323, end: 0x0323, idx:  -524 },
-  { start: 0x203e, end: 0x203e, idx: -7974 },
-  { start: 0x20ab, end: 0x20ac, idx: -8082 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x0103, .idx =     0 },
+  { .start = 0x0110, .end = 0x0111, .idx =   -12 },
+  { .start = 0x0152, .end = 0x0153, .idx =   -76 },
+  { .start = 0x0178, .end = 0x0178, .idx =  -112 },
+  { .start = 0x01a0, .end = 0x01a1, .idx =  -151 },
+  { .start = 0x01af, .end = 0x01b0, .idx =  -164 },
+  { .start = 0x0300, .end = 0x0309, .idx =  -499 },
+  { .start = 0x0323, .end = 0x0323, .idx =  -524 },
+  { .start = 0x203e, .end = 0x203e, .idx = -7974 },
+  { .start = 0x20ab, .end = 0x20ac, .idx = -8082 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/iconvdata/ibm1164.h b/iconvdata/ibm1164.h
index e1dcb1b..3fc5044 100644
--- a/iconvdata/ibm1164.h
+++ b/iconvdata/ibm1164.h
@@ -1,5 +1,5 @@
 /* Mapping table for IBM1164.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
 
@@ -88,17 +88,17 @@ static const uint32_t to_ucs4[256] =
 
 static const struct gap from_idx[] =
 {
-  { start: 0x0000, end: 0x0103, idx:     0 },
-  { start: 0x0110, end: 0x0111, idx:   -12 },
-  { start: 0x0152, end: 0x0153, idx:   -76 },
-  { start: 0x0178, end: 0x0178, idx:  -112 },
-  { start: 0x01a0, end: 0x01a1, idx:  -151 },
-  { start: 0x01af, end: 0x01b0, idx:  -164 },
-  { start: 0x0300, end: 0x0309, idx:  -499 },
-  { start: 0x0323, end: 0x0323, idx:  -524 },
-  { start: 0x203e, end: 0x203e, idx: -7974 },
-  { start: 0x20ab, end: 0x20ac, idx: -8082 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
+  { .start = 0x0000, .end = 0x0103, .idx =     0 },
+  { .start = 0x0110, .end = 0x0111, .idx =   -12 },
+  { .start = 0x0152, .end = 0x0153, .idx =   -76 },
+  { .start = 0x0178, .end = 0x0178, .idx =  -112 },
+  { .start = 0x01a0, .end = 0x01a1, .idx =  -151 },
+  { .start = 0x01af, .end = 0x01b0, .idx =  -164 },
+  { .start = 0x0300, .end = 0x0309, .idx =  -499 },
+  { .start = 0x0323, .end = 0x0323, .idx =  -524 },
+  { .start = 0x203e, .end = 0x203e, .idx = -7974 },
+  { .start = 0x20ab, .end = 0x20ac, .idx = -8082 },
+  { .start = 0xffff, .end = 0xffff, .idx =     0 }
 };
 
 static const char from_ucs4[] =
diff --git a/linuxthreads/forward.c b/linuxthreads/forward.c
index 499930a..5e31a43 100644
--- a/linuxthreads/forward.c
+++ b/linuxthreads/forward.c
@@ -54,11 +54,11 @@ FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0);
 
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
 FORWARD4 (pthread_attr_init_2_0, pthread_attr_init, int,
-	  (pthread_attr_t *attr), (attr), 0, GLIBC_2_0);
+	  (pthread_attr_t *attr), (attr), return 0, GLIBC_2_0);
 #endif
 
 FORWARD4 (pthread_attr_init_2_1, pthread_attr_init, int,
-	  (pthread_attr_t *attr), (attr), 0, GLIBC_2_1);
+	  (pthread_attr_t *attr), (attr), return 0, GLIBC_2_1);
 
 FORWARD (pthread_attr_getdetachstate,
 	 (const pthread_attr_t *attr, int *detachstate), (attr, detachstate),
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4d2b1e9..2ab96bc 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* forward.c (pthread_attr_init_2_0, pthread_attr_init_2_1):
+	Use return 0 as 6th argument to FORWARD4.
+	* pthread_equal.c: Include pthreadP.h instead of pthread.h.
+
 2002-12-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* descr.h (struct pthread) [NEED_DL_SYSINFO]: Add sysinfo member.
diff --git a/nptl/forward.c b/nptl/forward.c
index e68b9b1..4b7a120 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -55,11 +55,11 @@ FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0);
 
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
 FORWARD4 (pthread_attr_init_2_0, pthread_attr_init, int,
-	  (pthread_attr_t *attr), (attr), 0, GLIBC_2_0);
+	  (pthread_attr_t *attr), (attr), return 0, GLIBC_2_0);
 #endif
 
 FORWARD4 (pthread_attr_init_2_1, pthread_attr_init, int,
-	  (pthread_attr_t *attr), (attr), 0, GLIBC_2_1);
+	  (pthread_attr_t *attr), (attr), return 0, GLIBC_2_1);
 
 FORWARD (pthread_attr_getdetachstate,
 	 (const pthread_attr_t *attr, int *detachstate), (attr, detachstate),
diff --git a/nptl/pthread_equal.c b/nptl/pthread_equal.c
index 062da03..c998609 100644
--- a/nptl/pthread_equal.c
+++ b/nptl/pthread_equal.c
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <pthread.h>
+#include "pthreadP.h"
 
 
 int
diff --git a/nscd/connections.c b/nscd/connections.c
index 3abbdc2..e61c39c 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -548,6 +548,8 @@ nscd_run (void *p)
 	  timeout = now < next_prune ? 1000 * (next_prune - now) : 0;
 	}
     }
+  /* Shut up bogus GCC warning.  */
+  return NULL;
 }
 
 
diff --git a/posix/regex.c b/posix/regex.c
index 1d5dd0f..8557094 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -41,7 +41,7 @@
 #  define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
 #endif
 
-#if _LIBC || __GNUC__ >= 3
+#if __GNUC__ >= 3
 # define BE(expr, val) __builtin_expect (expr, val)
 #else
 # define BE(expr, val) (expr)
diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c
index 2cadf1c..44cf6a6 100644
--- a/stdio-common/tst-ungetc.c
+++ b/stdio-common/tst-ungetc.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#undef assert
 #define assert(x) \
   if (!(x)) \
     { \
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index c84305c..c93ab35 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -237,6 +237,6 @@
    their availability with one define.  The changes were made first
    for i386 and the have to be done separately for the other archs.
    For i386 we pick 2.5.50 as the first version with support.  */
-#if __LINUX_KERNEL_VERSION >= 132432
+#if __LINUX_KERNEL_VERSION >= 132402 && defined __i386__
 # define __ASSUME_CLONE_THREAD_FLAGS	1
 #endif