summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-31 21:10:07 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-31 21:10:07 +0000
commit6d6ee629afa277bc03dea147e937925e8cf3ec31 (patch)
tree4659cef14e08a04fd18d035f230eedda02dbb7db /malloc
parenta4baf360be5b32c2246d4a7b6fef34e2d5b0c4fe (diff)
downloadglibc-6d6ee629afa277bc03dea147e937925e8cf3ec31.tar.gz
glibc-6d6ee629afa277bc03dea147e937925e8cf3ec31.tar.xz
glibc-6d6ee629afa277bc03dea147e937925e8cf3ec31.zip
Update.
2002-12-31  Ulrich Drepper  <drepper@redhat.com>

	* malloc/thread-m.h [SHARED] (thread_atfork): Assume __dso_handle
	is available.

	* sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv): Re-add
Diffstat (limited to 'malloc')
-rw-r--r--malloc/thread-m.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/malloc/thread-m.h b/malloc/thread-m.h
index d3352d1fe5..d65ba913b2 100644
--- a/malloc/thread-m.h
+++ b/malloc/thread-m.h
@@ -77,9 +77,14 @@ extern void *__dso_handle __attribute__ ((__weak__));
 
 #include <fork.h>
 
-#define thread_atfork(prepare, parent, child) \
+#ifdef SHARED
+# define thread_atfork(prepare, parent, child) \
+   __register_atfork (prepare, parent, child, __dso_handle)
+#else
+# define thread_atfork(prepare, parent, child) \
    __register_atfork (prepare, parent, child,				      \
 		      &__dso_handle == NULL ? NULL : __dso_handle)
+#endif
 
 #elif defined(MUTEX_INITIALIZER)
 /* Assume hurd, with cthreads */