r2742 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2007-12-10 10:00:19 +0000 (Mon, 10 Dec 2007)
New Revision: 2742
Added:
glibc-package/trunk/debian/patches/any/cvs-wchar_h.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-malloc_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/submitted-malloc_h.diff: removed, replaced by
patches/any/cvs-wchar_h.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-12-10 09:48:38 UTC (rev 2741)
+++ glibc-package/trunk/debian/changelog 2007-12-10 10:00:19 UTC (rev 2742)
@@ -9,8 +9,10 @@
crash when %as is used with sscanf(). Closes: bug#453408.
* debian/rules: also set CXX when cross-compiling.
* kfreebsd/local-sysdeps.diff: update to revision 2071 (from glibc-bsd).
+ * patches/any/submitted-malloc_h.diff: removed, replaced by
+ patches/any/cvs-wchar_h.diff.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 09 Dec 2007 00:38:12 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 10 Dec 2007 10:59:47 +0100
glibc (2.7-4) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-wchar_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-wchar_h.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-wchar_h.diff 2007-12-10 10:00:19 UTC (rev 2742)
@@ -0,0 +1,24 @@
+2007-12-08 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #5428]
+ * wcsmbs/wchar.h: Unconditionally undefine __need_mbstate and
+ __need_wint_t.
+
+Index: wcsmbs/wchar.h
+===================================================================
+RCS file: /cvs/glibc/libc/wcsmbs/wchar.h,v
+retrieving revision 1.75
+retrieving revision 1.76
+diff -u -d -p -r1.75 -r1.76
+--- wcsmbs/wchar.h 26 Nov 2007 22:50:59 -0000 1.75
++++ wcsmbs/wchar.h 10 Dec 2007 01:40:23 -0000 1.76
+@@ -839,4 +839,9 @@ __END_DECLS
+
+ #endif /* _WCHAR_H defined */
+
++/* Undefined all __need_* constants in case we are included to get those
++ constants but the whole file was already read. */
++#undef __need_mbstate_t
++#undef __need_wint_t
++
+ #endif /* wchar.h */
Deleted: glibc-package/trunk/debian/patches/any/submitted-malloc_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-malloc_h.diff 2007-12-10 09:48:38 UTC (rev 2741)
+++ glibc-package/trunk/debian/patches/any/submitted-malloc_h.diff 2007-12-10 10:00:19 UTC (rev 2742)
@@ -1,22 +0,0 @@
-2007-11-19 Aurelien Jarno <aurelien@aurel32.net>
-
- * malloc/malloc.h: Define __need_NULL, __need_ptrdiff_t
- and__need_size_t.
-
-Index: malloc/malloc.h
-===================================================================
-RCS file: /cvs/glibc/libc/malloc/malloc.h,v
-retrieving revision 1.30
-diff -u -d -p -r1.30 malloc.h
---- malloc/malloc.h 19 Jul 2007 17:05:07 -0000 1.30
-+++ malloc/malloc.h 28 Nov 2007 07:57:02 -0000
-@@ -22,6 +22,9 @@
- #define _MALLOC_H 1
-
- #include <features.h>
-+#define __need_NULL
-+#define __need_ptrdiff_t
-+#define __need_size_t
- #include <stddef.h>
- # define __malloc_ptr_t void *
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-12-10 09:48:38 UTC (rev 2741)
+++ glibc-package/trunk/debian/patches/series 2007-12-10 10:00:19 UTC (rev 2742)
@@ -120,6 +120,7 @@
any/cvs-ether_line.diff -p0
any/cvs-sched_h.diff -p0
any/cvs-tzfile.diff -p1
+any/cvs-wchar_h.diff -p0
any/local-notls.diff -p0
any/local-asserth-decls.diff -p0
any/local-bashisms.diff -p0
@@ -166,7 +167,6 @@
any/submitted-date-and-unknown-tz.diff -p0
any/submitted-libgcc_s.so.diff -p0
any/submitted-longdouble.diff -p0
-any/submitted-malloc_h.diff -p0
any/submitted-sched_h.diff -p0
any/submitted-rfc3484-sortv4.diff -p0
any/local-disable-nscd-host-caching.diff
Reply to: