8 files changed, 6 insertions, 42 deletions
diff --git a/lib/libpthread/arch/alpha/_spinlock.h b/lib/libpthread/arch/alpha/_spinlock.h
deleted file mode 100644
index 259260c28a0..00000000000
--- a/lib/libpthread/arch/alpha/_spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$OpenBSD: _spinlock.h,v 1.1 1998/12/21 07:36:59 d Exp $	*/
-
-#define _SPINLOCK_UNLOCKED	(0)
-#define _SPINLOCK_LOCKED	(1)
-typedef int _spinlock_lock_t;
-
diff --git a/lib/libpthread/arch/hppa/_spinlock.h b/lib/libpthread/arch/hppa/_spinlock.h
deleted file mode 100644
index 24a82c11472..00000000000
--- a/lib/libpthread/arch/hppa/_spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$OpenBSD: _spinlock.h,v 1.1 1998/12/21 22:54:55 mickey Exp $	*/
-
-#define _SPINLOCK_UNLOCKED      (1)
-#define _SPINLOCK_LOCKED        (0)
-typedef int _spinlock_lock_t;
-
diff --git a/lib/libpthread/arch/i386/_spinlock.h b/lib/libpthread/arch/i386/_spinlock.h
deleted file mode 100644
index f67c9db8eea..00000000000
--- a/lib/libpthread/arch/i386/_spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$OpenBSD: _spinlock.h,v 1.1 1998/12/21 07:58:45 d Exp $	*/
-
-#define _SPINLOCK_UNLOCKED	(0)
-#define _SPINLOCK_LOCKED	(1)
-typedef int _spinlock_lock_t;
-
diff --git a/lib/libpthread/arch/m68k/_spinlock.h b/lib/libpthread/arch/m68k/_spinlock.h
deleted file mode 100644
index 06f9ffeb540..00000000000
--- a/lib/libpthread/arch/m68k/_spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$OpenBSD: _spinlock.h,v 1.1 1998/12/21 07:37:00 d Exp $	*/
-
-#define _SPINLOCK_UNLOCKED	(0)
-#define _SPINLOCK_LOCKED	(1)
-typedef int _spinlock_lock_t;
-
diff --git a/lib/libpthread/arch/powerpc/_spinlock.h b/lib/libpthread/arch/powerpc/_spinlock.h
deleted file mode 100644
index a1e95b6aafa..00000000000
--- a/lib/libpthread/arch/powerpc/_spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$OpenBSD: _spinlock.h,v 1.1 1998/12/21 07:22:26 d Exp $	*/
-
-#define _SPINLOCK_UNLOCKED	(0)
-#define _SPINLOCK_LOCKED	(1)
-typedef register_t _spinlock_lock_t;
-
diff --git a/lib/libpthread/arch/sparc/_spinlock.h b/lib/libpthread/arch/sparc/_spinlock.h
deleted file mode 100644
index 87b8e5485e3..00000000000
--- a/lib/libpthread/arch/sparc/_spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$OpenBSD: _spinlock.h,v 1.1 1998/12/21 07:37:01 d Exp $	*/
-
-#define _SPINLOCK_UNLOCKED	(0)
-#define _SPINLOCK_LOCKED	(1)
-typedef int _spinlock_lock_t;
-
diff --git a/lib/libpthread/include/Makefile.inc b/lib/libpthread/include/Makefile.inc
index 389952b97f1..effa4647bfb 100644
--- a/lib/libpthread/include/Makefile.inc
+++ b/lib/libpthread/include/Makefile.inc
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.1 1998/09/05 07:40:47 d Exp $
+# $OpenBSD: Makefile.inc,v 1.2 1999/01/08 08:25:37 d Exp $
 
 includes:
 	@cd ${.CURDIR}/include; \
-	 for h in pthread.h pthread_np.h sched.h; do \
+	 for h in pthread.h pthread_np.h sched.h spinlock.h; do \
 		cmp -s $$h ${DESTDIR}/usr/include/$$h > /dev/null 2>&1 || \
 		(echo ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
 			-m 444 $$h ${DESTDIR}/usr/include; \
diff --git a/lib/libpthread/include/spinlock.h b/lib/libpthread/include/spinlock.h
index 0c49f5ec5df..152e6f2e775 100644
--- a/lib/libpthread/include/spinlock.h
+++ b/lib/libpthread/include/spinlock.h
@@ -29,8 +29,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: spinlock.h,v 1.1 1998/12/21 07:58:55 d Exp $
- * $OpenBSD: spinlock.h,v 1.1 1998/12/21 07:58:55 d Exp $
+ * $Id: spinlock.h,v 1.2 1999/01/08 08:25:37 d Exp $
+ * $OpenBSD: spinlock.h,v 1.2 1999/01/08 08:25:37 d Exp $
  *
  * Lock definitions used in both libc and libpthread.
  *
@@ -40,14 +40,14 @@
 #define _SPINLOCK_H_
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include "_spinlock.h"
+#include <machine/spinlock.h>
 
 /*
  * Lock structure with room for debugging information.
  */
 typedef struct {
 	volatile _spinlock_lock_t access_lock;
-	volatile long	lock_owner;
+	volatile void *	lock_owner;
 	volatile const char * fname;
 	volatile int	lineno;
 } spinlock_t;