From 4953d0e707e86726b500ad1e34b245c6d5a6bac1 Mon Sep 17 00:00:00 2001
From: David Leonard <d@cvs.openbsd.org>
Date: Fri, 8 Jan 1999 08:25:38 +0000
Subject: move spinlock.h into the real world

---
 lib/libc_r/include/Makefile.inc | 4 ++--
 lib/libc_r/include/spinlock.h   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/libc_r/include')

diff --git a/lib/libc_r/include/Makefile.inc b/lib/libc_r/include/Makefile.inc
index 389952b97f1..effa4647bfb 100644
--- a/lib/libc_r/include/Makefile.inc
+++ b/lib/libc_r/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/libc_r/include/spinlock.h b/lib/libc_r/include/spinlock.h
index 0c49f5ec5df..152e6f2e775 100644
--- a/lib/libc_r/include/spinlock.h
+++ b/lib/libc_r/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;
-- 
cgit v1.2.3