Remove #include of spinlock.h from libc_private.h. Declare spinlocks as

struct _spinlock.  Keep the typedef in for now; another set of changes
may come around to clean up consumers of spinlocks.

Requested by:	bde

2 files changed, 4 insertions, 5 deletions

diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index d4265e9..f18dde5 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -38,8 +38,6 @@
 #ifndef _LIBC_PRIVATE_H_
 #define _LIBC_PRIVATE_H_
 
-#include <spinlock.h>
-
 /*
  * This global flag is non-zero when a process has created one
  * or more threads. It is used to avoid calling locking functions
@@ -126,6 +124,6 @@ extern const char *__progname;
  * This is the lock to make malloc() thread-safe.  It is externalized
  * so that thread libraries can protect malloc across fork().
  */
-extern spinlock_t *__malloc_lock;
+extern struct _spinlock *__malloc_lock;
 
 #endif /* _LIBC_PRIVATE_H_ */
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
index 6334253..eee1969 100644
--- a/lib/libc/include/spinlock.h
+++ b/lib/libc/include/spinlock.h
@@ -43,12 +43,13 @@
 /*
  * Lock structure with room for debugging information.
  */
-typedef struct {
+struct _spinlock {
 	volatile long	access_lock;
 	volatile long	lock_owner;
 	volatile char	*fname;
 	volatile int	lineno;
-} spinlock_t;
+};
+typedef struct _spinlock spinlock_t;
 
 #define	_SPINLOCK_INITIALIZER	{ 0, 0, 0, 0 }