2003-05-08  Ulrich Drepper  <drepper@redhat.com>

	* malloc/thread-m.h: Remove special handling of thread_atfork if
	HAVE_register_atfork_malloc is defined.

diff -upr -x CVS libc/malloc/thread-m.h libc.bad/malloc/thread-m.h
--- libc/malloc/thread-m.h	2003-05-09 09:20:27.000000000 -0700
+++ libc.bad/malloc/thread-m.h	2003-05-09 08:22:25.000000000 -0700
@@ -77,24 +77,13 @@ extern void *__dso_handle __attribute__ 
 
 #include <fork.h>
 
-#ifdef HAVE_register_atfork_malloc
-# ifdef SHARED
-#  define thread_atfork(prepare, parent, child) \
-   __register_atfork_malloc (prepare, parent, child, __dso_handle)
-# else
-#  define thread_atfork(prepare, parent, child) \
-   __register_atfork_malloc (prepare, parent, child,			      \
-			     &__dso_handle == NULL ? NULL : __dso_handle)
-# endif
-#else
-# ifdef SHARED
-#  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) \
+#else
+# define thread_atfork(prepare, parent, child) \
    __register_atfork (prepare, parent, child,				      \
 		      &__dso_handle == NULL ? NULL : __dso_handle)
-# endif
 #endif
 
 #elif defined(MUTEX_INITIALIZER)