remove _MALLOC_LOCK_INIT; major bump; ok deraadt@

4 files changed, 4 insertions, 18 deletions

diff --git a/lib/libc/include/thread_private.h b/lib/libc/include/thread_private.h
index f55880f7bae..c36bb02c5ac 100644
--- a/lib/libc/include/thread_private.h
+++ b/lib/libc/include/thread_private.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: thread_private.h,v 1.22 2008/01/01 00:43:39 kurt Exp $ */
+/* $OpenBSD: thread_private.h,v 1.23 2008/06/13 21:18:42 otto Exp $ */
 
 /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
 
@@ -133,10 +133,6 @@ void	_thread_malloc_unlock(void);
 					if (__isthreaded)		\
 						_thread_malloc_unlock();\
 				} while (0)
-#define _MALLOC_LOCK_INIT()	do {					\
-					if (__isthreaded)		\
-						_thread_malloc_init();\
-				} while (0)
 
 void	_thread_atexit_lock(void);
 void	_thread_atexit_unlock(void);
diff --git a/lib/libc/shlib_version b/lib/libc/shlib_version
index 5670d95b527..c7d2bf00d13 100644
--- a/lib/libc/shlib_version
+++ b/lib/libc/shlib_version
@@ -1,4 +1,4 @@
-major=45
+major=46
 minor=0
 # note: If changes were made to include/thread_private.h or if system
 # calls were added/changed then libpthread must also be updated.
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index a4a4e52bda6..6042e47e690 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.90 2008/05/19 19:36:15 otto Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.91 2008/06/13 21:18:42 otto Exp $	*/
 
 /*
  * ----------------------------------------------------------------------------
@@ -656,8 +656,6 @@ malloc_init(void)
 	char		*p, b[64];
 	int		i, j, save_errno = errno;
 
-	_MALLOC_LOCK_INIT();
-
 #ifdef MALLOC_EXTRA_SANITY
 	malloc_junk = 1;
 #endif /* MALLOC_EXTRA_SANITY */
diff --git a/lib/libc/thread/unithread_malloc_lock.c b/lib/libc/thread/unithread_malloc_lock.c
index ca5081ba780..920250139b8 100644
--- a/lib/libc/thread/unithread_malloc_lock.c
+++ b/lib/libc/thread/unithread_malloc_lock.c
@@ -1,15 +1,13 @@
-/*	$OpenBSD: unithread_malloc_lock.c,v 1.7 2008/01/01 00:43:39 kurt Exp $	*/
+/*	$OpenBSD: unithread_malloc_lock.c,v 1.8 2008/06/13 21:18:43 otto Exp $	*/
 
 #include <sys/time.h>
 #include "thread_private.h"
 
 WEAK_PROTOTYPE(_thread_malloc_lock);
 WEAK_PROTOTYPE(_thread_malloc_unlock);
-WEAK_PROTOTYPE(_thread_malloc_init);
 
 WEAK_ALIAS(_thread_malloc_lock);
 WEAK_ALIAS(_thread_malloc_unlock);
-WEAK_ALIAS(_thread_malloc_init);
 
 WEAK_PROTOTYPE(_thread_atexit_lock);
 WEAK_PROTOTYPE(_thread_atexit_unlock);
@@ -36,12 +34,6 @@ WEAK_NAME(_thread_malloc_unlock)(void)
 }
 
 void
-WEAK_NAME(_thread_malloc_init)(void)
-{
-	return;
-}
-
-void
 WEAK_NAME(_thread_atexit_lock)(void)
 {
 	return;