From 6d524f29064641b4801103be273f47b0c6f308a6 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 17 Dec 2008 10:06:55 -0800
Subject: [PATCH] Cleanup some of the #ifndef/#defines

---
 lib/libspl/include/assert.h  | 6 +++---
 lib/libspl/include/stdlib.h  | 4 ++--
 lib/libspl/include/string.h  | 4 ++--
 lib/libspl/include/strings.h | 4 ++--
 lib/libspl/include/synch.h   | 4 ++--
 lib/libspl/include/ucred.h   | 4 ++--
 lib/libspl/include/umem.h    | 4 ++--
 lib/libspl/include/unistd.h  | 6 +++---
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
index a87d70792a..049d467a6b 100644
--- a/lib/libspl/include/assert.h
+++ b/lib/libspl/include/assert.h
@@ -26,8 +26,8 @@
 
 #include_next <assert.h>
 
-#ifndef _SOL_ASSERT_H
-#define _SOL_ASSERT_H
+#ifndef _LIBSPL_ASSERT_H
+#define _LIBSPL_ASSERT_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -91,4 +91,4 @@ _NOTE(CONSTCOND) } while (0)
 #define	ASSERT3P(x, y, z)	VERIFY3P(x, y, z)
 #endif  /* NDEBUG */
 
-#endif  /* _SOL_ASSERT_H */
+#endif  /* _LIBSPL_ASSERT_H */
diff --git a/lib/libspl/include/stdlib.h b/lib/libspl/include/stdlib.h
index 67dcb587e0..67d6e96e00 100644
--- a/lib/libspl/include/stdlib.h
+++ b/lib/libspl/include/stdlib.h
@@ -26,8 +26,8 @@
 
 #include_next <stdlib.h>
 
-#ifndef _SOL_STDLIB_H
-#define _SOL_STDLIB_H
+#ifndef _LIBSPL_STDLIB_H
+#define _LIBSPL_STDLIB_H
 
 extern const char *getexecname(void);
 
diff --git a/lib/libspl/include/string.h b/lib/libspl/include/string.h
index 6927d4a6fc..213977d0e9 100644
--- a/lib/libspl/include/string.h
+++ b/lib/libspl/include/string.h
@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_STRING_H
-#define _SOL_STRING_H
+#ifndef _LIBSPL_STRING_H
+#define _LIBSPL_STRING_H
 
 #include_next <string.h>
 
diff --git a/lib/libspl/include/strings.h b/lib/libspl/include/strings.h
index a6d5ffa95a..48944e1428 100644
--- a/lib/libspl/include/strings.h
+++ b/lib/libspl/include/strings.h
@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_STRINGS_H
-#define _SOL_STRINGS_H
+#ifndef _LIBSPL_STRINGS_H
+#define _LIBSPL_STRINGS_H
 
 #include <string.h>
 #include_next <strings.h>
diff --git a/lib/libspl/include/synch.h b/lib/libspl/include/synch.h
index afddcfd2ba..2da270a428 100644
--- a/lib/libspl/include/synch.h
+++ b/lib/libspl/include/synch.h
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYNCH_H
-#define _SOL_SYNCH_H
+#ifndef _LIBSPL_SYNCH_H
+#define _LIBSPL_SYNCH_H
 
 #endif
diff --git a/lib/libspl/include/ucred.h b/lib/libspl/include/ucred.h
index e1c3342fbd..4ca424ed38 100644
--- a/lib/libspl/include/ucred.h
+++ b/lib/libspl/include/ucred.h
@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_UCRED_H
-#define _SOL_UCRED_H
+#ifndef _LIBSPL_UCRED_H
+#define _LIBSPL_UCRED_H
 
 typedef int ucred_t;
 
diff --git a/lib/libspl/include/umem.h b/lib/libspl/include/umem.h
index 334b342ae7..3e19aff9ec 100644
--- a/lib/libspl/include/umem.h
+++ b/lib/libspl/include/umem.h
@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_UMEM_H
-#define _SOL_UMEM_H
+#ifndef _LIBSPL_UMEM_H
+#define _LIBSPL_UMEM_H
 
 /* XXX: We should use the real portable umem library if it is detected
  * at configure time.  However, if the library is not available we can
diff --git a/lib/libspl/include/unistd.h b/lib/libspl/include/unistd.h
index 92c01aad79..493efa81be 100644
--- a/lib/libspl/include/unistd.h
+++ b/lib/libspl/include/unistd.h
@@ -26,8 +26,8 @@
 
 #include_next <unistd.h>
 
-#ifndef _SYS_UNISTD_H
-#define _SYS_UNISTD_H
+#ifndef _LIBSPL_UNISTD_H
+#define _LIBSPL_UNISTD_H
 
 #include <zfs_config.h>
 
@@ -56,4 +56,4 @@ static inline long fake_gethostid(void)
 #define gethostid() fake_gethostid()
 #endif
 
-#endif /* _SYS_UNISTD_H */
+#endif /* _LIBSPL_UNISTD_H */