From: Roland McGrath <roland@gnu.org>
Date: Fri, 22 Jul 2005 05:26:10 +0000 (+0000)
Subject: Updated to fedora-glibc-20050722T0433
X-Git-Tag: cvs/fedora-glibc-2_3_90-4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8075c26a4cf5ee1db6de4a27dc3d50c7cc36c9b4;p=thirdparty%2Fglibc.git

Updated to fedora-glibc-20050722T0433
---

diff --git a/ChangeLog b/ChangeLog
index 01dd07a0b7d..2d1bc63dea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
+2005-07-21  Roland McGrath  <roland@redhat.com>
+
+	* stdlib/Makefile (headers): Move bits/wchar.h to ...
+	* wcsmbs/Makefile (headers): ... here.  Add bits/wchar2.h too.
+
 2005-07-21  Jakub Jelinek  <jakub@redhat.com>
 
 	* wcsmbs/bits/wchar2.h (swprintf): Remove format argument.
 	* debug/tst-chk1.c (do_test): Add test for swprintf with format
 	being the last argument.
 
+2005-07-21  Thorsten Kukuk  <kukuk@suse.de>
+
+	* debug/getgroups_chk.c (__getgroups_chk): Fix return value.
+
+	* stdio-common/fxprintf.c: Include string.h.
+
 2005-07-20  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/x86_64/fpu/libm-test-ulps: Adjust expected atan2f results.
diff --git a/debug/getgroups_chk.c b/debug/getgroups_chk.c
index 6401b023d3d..c877ddb9cae 100644
--- a/debug/getgroups_chk.c
+++ b/debug/getgroups_chk.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 
-char *
+int
 __getgroups_chk (int size, __gid_t list[], size_t listlen)
 {
   if (__builtin_expect (size * sizeof (__gid_t) > listlen, 0))
diff --git a/fedora/branch.mk b/fedora/branch.mk
index c00168229f4..1c1feacc423 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,7 @@
 # This file is updated automatically by Makefile.
 glibc-branch := fedora
 glibc-base := HEAD
-fedora-sync-date := 2005-07-21 08:14 UTC
-fedora-sync-tag := fedora-glibc-20050721T0814
+DIST_BRANCH := devel
+COLLECTION := dist-fc4
+fedora-sync-date := 2005-07-22 04:33 UTC
+fedora-sync-tag := fedora-glibc-20050722T0433
diff --git a/stdio-common/fxprintf.c b/stdio-common/fxprintf.c
index 298e5f22b0e..3b3cc5cddaa 100644
--- a/stdio-common/fxprintf.c
+++ b/stdio-common/fxprintf.c
@@ -22,6 +22,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
+#include <string.h>
 
 
 int
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 841663129db..509a7b2228a 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -22,7 +22,7 @@
 subdir	:= stdlib
 
 headers	:= stdlib.h alloca.h monetary.h fmtmsg.h ucontext.h sys/ucontext.h    \
-	   inttypes.h stdint.h bits/wordsize.h bits/wchar.h		      \
+	   inttypes.h stdint.h bits/wordsize.h				      \
 	   errno.h sys/errno.h bits/errno.h bits/stdlib.h
 
 routines	:=							      \
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 47a489a63c6..d033de931c1 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995-2000,2002,2003,2004,2005 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 #
 subdir	:= wcsmbs
 
-headers	:= wchar.h
+headers	:= wchar.h bits/wchar.h bits/wchar2.h
 distribute := wcwidth.h wcsmbsload.h
 
 routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \