From e23605530abecc966ac6a79839c07c7a930fa17a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 17 Dec 2008 10:10:32 -0800 Subject: [PATCH] Update #ifndef/#defines --- lib/libspl/include/atomic.h | 6 +++--- lib/libspl/include/devid.h | 4 ++-- lib/libspl/include/libdevinfo.h | 6 +++--- lib/libspl/include/libshare.h | 6 +++--- lib/libspl/include/priv.h | 4 ++-- lib/libspl/include/zone.h | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/libspl/include/atomic.h b/lib/libspl/include/atomic.h index 8ce8f592dc..7173579497 100644 --- a/lib/libspl/include/atomic.h +++ b/lib/libspl/include/atomic.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SYS_ATOMIC_H -#define _SYS_ATOMIC_H +#ifndef _LIBSPL_ATOMIC_H +#define _LIBSPL_ATOMIC_H @@ -435,4 +435,4 @@ extern uint32_t swapl(uint32_t *, uint32_t); } #endif -#endif /* _SYS_ATOMIC_H */ +#endif /* _LIBSPL_ATOMIC_H */ diff --git a/lib/libspl/include/devid.h b/lib/libspl/include/devid.h index 4f92fbe8d5..9dfdae84b5 100644 --- a/lib/libspl/include/devid.h +++ b/lib/libspl/include/devid.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _DEVID_H -#define _DEVID_H +#ifndef _LIBSPL_DEVID_H +#define _LIBSPL_DEVID_H #include diff --git a/lib/libspl/include/libdevinfo.h b/lib/libspl/include/libdevinfo.h index 0d58eb793e..f0f9d7e8ea 100644 --- a/lib/libspl/include/libdevinfo.h +++ b/lib/libspl/include/libdevinfo.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _LIBDEVINFO_H -#define _LIBDEVINFO_H +#ifndef _LIBSPL_LIBDEVINFO_H +#define _LIBSPL_LIBDEVINFO_H -#endif /* _LIBDEVINFO_H */ +#endif /* _LIBSPL_LIBDEVINFO_H */ diff --git a/lib/libspl/include/libshare.h b/lib/libspl/include/libshare.h index 4976f6f7fe..afbdf5b056 100644 --- a/lib/libspl/include/libshare.h +++ b/lib/libspl/include/libshare.h @@ -28,7 +28,7 @@ * basic API declarations for share management */ -#ifndef _LIBSHARE_H -#define _LIBSHARE_H +#ifndef _LIBSPL_LIBSHARE_H +#define _LIBSPL_LIBSHARE_H -#endif /* _LIBSHARE_H */ +#endif /* _LIBSPL_LIBSHARE_H */ diff --git a/lib/libspl/include/priv.h b/lib/libspl/include/priv.h index 873502b4f7..6c9a2c0e66 100644 --- a/lib/libspl/include/priv.h +++ b/lib/libspl/include/priv.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _PRIV_H -#define _PRIV_H +#ifndef _LIBSPL_PRIV_H +#define _LIBSPL_PRIV_H #include diff --git a/lib/libspl/include/zone.h b/lib/libspl/include/zone.h index 3c18b61059..366f95b147 100644 --- a/lib/libspl/include/zone.h +++ b/lib/libspl/include/zone.h @@ -23,8 +23,8 @@ * Use is subject to license terms. */ -#ifndef _ZONE_H -#define _ZONE_H +#ifndef _LIBSPL_ZONE_H +#define _LIBSPL_ZONE_H @@ -83,4 +83,4 @@ extern int zone_list_datalink(zoneid_t, int *, char *); } #endif -#endif /* _ZONE_H */ +#endif /* _LIBSPL_ZONE_H */