aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--malloc/malloc.c1
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2a8ff7ffd..ec76edf14e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
2002-09-29 Roland McGrath <roland@redhat.com>
- * sysdeps/mach/hurd/Versions (ld: GLIBC_2.2.6): Add __errno_location.
+ * malloc/malloc.c [! MALLOC_DEBUG] (assert): #undef before defining.
-2002-09-29 Roland McGrath <roland@redhat.com>
+ * sysdeps/mach/hurd/Versions (ld: GLIBC_2.2.6): Add __errno_location.
* sysdeps/unix/sysv/linux/x86_64/sysdep.S [USE_TLS && HAVE___THREAD]:
Define errno in .tbss.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 4c78587fa8..33ae7212c9 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-29 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/pthread/tst-timer.c (main): Clear
+ SIGEV2.sigev_notify_attributes.
+
2002-09-29 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/useldt.h (DO_SET_THREAD_AREA): Don't use
diff --git a/malloc/malloc.c b/malloc/malloc.c
index d480b0b8d0..757e65a37f 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -307,6 +307,7 @@ extern "C" {
#if MALLOC_DEBUG
#include <assert.h>
#else
+#undef assert
#define assert(x) ((void)0)
#endif