From 11bfcffb6a70997a62dbf28b32a55f7cc5d53725 Mon Sep 17 00:00:00 2001
From: David Leonard <d@cvs.openbsd.org>
Date: Thu, 6 Jan 2000 15:07:07 +0000
Subject: rename thread_storage to unithread_storage to avoid object name
 conflict

---
 lib/libc/thread/Makefile.inc        |  4 ++--
 lib/libc/thread/thread_storage.c    | 40 -------------------------------------
 lib/libc/thread/unithread_storage.c | 40 +++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 lib/libc/thread/thread_storage.c
 create mode 100644 lib/libc/thread/unithread_storage.c

(limited to 'lib/libc')

diff --git a/lib/libc/thread/Makefile.inc b/lib/libc/thread/Makefile.inc
index 08610fe77cd..8abec94f330 100644
--- a/lib/libc/thread/Makefile.inc
+++ b/lib/libc/thread/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2000/01/06 07:27:33 d Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2000/01/06 15:07:06 d Exp $
 
 .PATH: ${LIBCSRCDIR}/thread
 
-SRCS+=	thread_fd.c thread_storage.c
+SRCS+=	thread_fd.c unithread_storage.c
 
diff --git a/lib/libc/thread/thread_storage.c b/lib/libc/thread/thread_storage.c
deleted file mode 100644
index cd810627a11..00000000000
--- a/lib/libc/thread/thread_storage.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$OpenBSD: thread_storage.c,v 1.1 2000/01/06 07:27:33 d Exp $	*/
-/*
- * 
- */
-/* unthreaded storage allocation helper functions */
-
-#include <sys/cdefs.h>
-#include <pthread.h>
-#include "thread_private.h"
-
-WEAK_PROTOTYPE(_libc_private_storage_lock);
-WEAK_PROTOTYPE(_libc_private_storage_unlock);
-WEAK_PROTOTYPE(_libc_private_storage);
-
-WEAK_ALIAS(_libc_private_storage_lock);
-WEAK_ALIAS(_libc_private_storage_unlock);
-WEAK_ALIAS(_libc_private_storage);
-
-void
-WEAK_NAME(_libc_private_storage_lock)(mutex)
-	pthread_mutex_t *mutex;
-{
-}
-
-void
-WEAK_NAME(_libc_private_storage_unlock)(mutex)
-	pthread_mutex_t *mutex;
-{
-}
-
-void *
-WEAK_NAME(_libc_private_storage)(key, init, initsz, error)
-	volatile struct _thread_private_key_struct * key;
-	void *init;
-	size_t initsz;
-	void *error;
-{
-
-	return init;
-}
diff --git a/lib/libc/thread/unithread_storage.c b/lib/libc/thread/unithread_storage.c
new file mode 100644
index 00000000000..456082a8a2b
--- /dev/null
+++ b/lib/libc/thread/unithread_storage.c
@@ -0,0 +1,40 @@
+/*	$OpenBSD: unithread_storage.c,v 1.1 2000/01/06 15:07:06 d Exp $	*/
+/*
+ * 
+ */
+/* unthreaded storage allocation helper functions */
+
+#include <sys/cdefs.h>
+#include <pthread.h>
+#include "thread_private.h"
+
+WEAK_PROTOTYPE(_libc_private_storage_lock);
+WEAK_PROTOTYPE(_libc_private_storage_unlock);
+WEAK_PROTOTYPE(_libc_private_storage);
+
+WEAK_ALIAS(_libc_private_storage_lock);
+WEAK_ALIAS(_libc_private_storage_unlock);
+WEAK_ALIAS(_libc_private_storage);
+
+void
+WEAK_NAME(_libc_private_storage_lock)(mutex)
+	pthread_mutex_t *mutex;
+{
+}
+
+void
+WEAK_NAME(_libc_private_storage_unlock)(mutex)
+	pthread_mutex_t *mutex;
+{
+}
+
+void *
+WEAK_NAME(_libc_private_storage)(key, init, initsz, error)
+	volatile struct _thread_private_key_struct * key;
+	void *init;
+	size_t initsz;
+	void *error;
+{
+
+	return init;
+}
-- 
cgit v1.2.3