diff --git a/lib/libspl/include/sys/bitmap.h b/lib/libspl/include/sys/bitmap.h index 9f494fe72b..8fef7fcfe3 100644 --- a/lib/libspl/include/sys/bitmap.h +++ b/lib/libspl/include/sys/bitmap.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_BITMAP_H -#define _SOL_SYS_BITMAP_H +#ifndef _LIBSPL_SYS_BITMAP_H +#define _LIBSPL_SYS_BITMAP_H #endif diff --git a/lib/libspl/include/sys/cmn_err.h b/lib/libspl/include/sys/cmn_err.h index 525e3cadb2..d199361d78 100644 --- a/lib/libspl/include/sys/cmn_err.h +++ b/lib/libspl/include/sys/cmn_err.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_CMN_ERR_H -#define _SOL_SYS_CMN_ERR_H +#ifndef _LIBSPL_SYS_CMN_ERR_H +#define _LIBSPL_SYS_CMN_ERR_H #endif diff --git a/lib/libspl/include/sys/cred.h b/lib/libspl/include/sys/cred.h index b4fb6381ec..6a58315d47 100644 --- a/lib/libspl/include/sys/cred.h +++ b/lib/libspl/include/sys/cred.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_CRED_H -#define _SOL_SYS_CRED_H +#ifndef _LIBSPL_SYS_CRED_H +#define _LIBSPL_SYS_CRED_H typedef struct cred cred_t; diff --git a/lib/libspl/include/sys/debug.h b/lib/libspl/include/sys/debug.h index 238ffc00f7..0069620557 100644 --- a/lib/libspl/include/sys/debug.h +++ b/lib/libspl/include/sys/debug.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_DEBUG_H -#define _SOL_SYS_DEBUG_H +#ifndef _LIBSPL_SYS_DEBUG_H +#define _LIBSPL_SYS_DEBUG_H #include diff --git a/lib/libspl/include/sys/file.h b/lib/libspl/include/sys/file.h index 8908390b84..9aaba35bef 100644 --- a/lib/libspl/include/sys/file.h +++ b/lib/libspl/include/sys/file.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_FILE_H -#define _SOL_SYS_FILE_H +#ifndef _LIBSPL_SYS_FILE_H +#define _LIBSPL_SYS_FILE_H #include_next diff --git a/lib/libspl/include/sys/int_limits.h b/lib/libspl/include/sys/int_limits.h index 73deeeee1a..2b50ddd1bb 100644 --- a/lib/libspl/include/sys/int_limits.h +++ b/lib/libspl/include/sys/int_limits.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_INT_LIMITS_H -#define _SOL_SYS_INT_LIMITS_H +#ifndef _LIBSPL_SYS_INT_LIMITS_H +#define _LIBSPL_SYS_INT_LIMITS_H #endif diff --git a/lib/libspl/include/sys/mkdev.h b/lib/libspl/include/sys/mkdev.h new file mode 100644 index 0000000000..76e3a4fffb --- /dev/null +++ b/lib/libspl/include/sys/mkdev.h @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef _LIBSPL_SYS_MKDEV_H +#define _LIBSPL_SYS_MKDEV_H + +#endif diff --git a/lib/libspl/include/sys/mount.h b/lib/libspl/include/sys/mount.h index 640e160a72..144f915d2d 100644 --- a/lib/libspl/include/sys/mount.h +++ b/lib/libspl/include/sys/mount.h @@ -26,8 +26,8 @@ #include_next -#ifndef _SOL_SYS_MOUNT_H -#define _SOL_SYS_MOUNT_H +#ifndef _LIBSPL_SYS_MOUNT_H +#define _LIBSPL_SYS_MOUNT_H #include #include @@ -47,4 +47,4 @@ #define MS_NOMNTTAB 0 /* Not supported in Linux */ #define MS_OPTIONSTR 0 /* Not necessary in Linux */ -#endif /* _SOL_SYS_MOUNT_H */ +#endif /* _LIBSPL_SYS_MOUNT_H */ diff --git a/lib/libspl/include/sys/param.h b/lib/libspl/include/sys/param.h index a0576266be..5ea896fa40 100644 --- a/lib/libspl/include/sys/param.h +++ b/lib/libspl/include/sys/param.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_PARAM_H -#define _SOL_SYS_PARAM_H +#ifndef _LIBSPL_SYS_PARAM_H +#define _LIBSPL_SYS_PARAM_H #include_next #include diff --git a/lib/libspl/include/sys/priv.h b/lib/libspl/include/sys/priv.h index a7deb77f7e..4a3ab96847 100644 --- a/lib/libspl/include/sys/priv.h +++ b/lib/libspl/include/sys/priv.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_PRIV_H -#define _SOL_SYS_PRIV_H +#ifndef _LIBSPL_SYS_PRIV_H +#define _LIBSPL_SYS_PRIV_H #endif diff --git a/lib/libspl/include/sys/processor.h b/lib/libspl/include/sys/processor.h index b00c1eb821..ce80c88dfb 100644 --- a/lib/libspl/include/sys/processor.h +++ b/lib/libspl/include/sys/processor.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_PROCESSOR_H -#define _SOL_SYS_PROCESSOR_H +#ifndef _LIBSPL_SYS_PROCESSOR_H +#define _LIBSPL_SYS_PROCESSOR_H #define getcpuid() (-1) diff --git a/lib/libspl/include/sys/sdt.h b/lib/libspl/include/sys/sdt.h index e194402a27..0c9a22cdf2 100644 --- a/lib/libspl/include/sys/sdt.h +++ b/lib/libspl/include/sys/sdt.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_SDT_H -#define _SOL_SYS_SDT_H +#ifndef _LIBSPL_SYS_SDT_H +#define _LIBSPL_SYS_SDT_H #define DTRACE_PROBE1(a,b,c) ((void) 0) #define DTRACE_PROBE2(a,b,c,d,e) ((void) 0) diff --git a/lib/libspl/include/sys/sysevent.h b/lib/libspl/include/sys/sysevent.h index c28ee1b0a5..980d145417 100644 --- a/lib/libspl/include/sys/sysevent.h +++ b/lib/libspl/include/sys/sysevent.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_SYSEVENT_H -#define _SOL_SYS_SYSEVENT_H +#ifndef _LIBSPL_SYS_SYSEVENT_H +#define _LIBSPL_SYS_SYSEVENT_H #endif diff --git a/lib/libspl/include/sys/sysmacros.h b/lib/libspl/include/sys/sysmacros.h index a6c00c88d8..02eea9e9a9 100644 --- a/lib/libspl/include/sys/sysmacros.h +++ b/lib/libspl/include/sys/sysmacros.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_SYSMACROS_H -#define _SOL_SYS_SYSMACROS_H +#ifndef _LIBSPL_SYS_SYSMACROS_H +#define _LIBSPL_SYS_SYSMACROS_H #include_next @@ -93,4 +93,4 @@ #define offsetof(s, m) ((size_t)(&(((s *)0)->m))) #endif -#endif /* _SOL_SYS_SYSMACROS_H */ +#endif /* _LIBSPL_SYS_SYSMACROS_H */ diff --git a/lib/libspl/include/sys/systeminfo.h b/lib/libspl/include/sys/systeminfo.h index dccafbfe97..5d7e41c435 100644 --- a/lib/libspl/include/sys/systeminfo.h +++ b/lib/libspl/include/sys/systeminfo.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_SYSTEMINFO_H -#define _SOL_SYS_SYSTEMINFO_H +#ifndef _LIBSPL_SYS_SYSTEMINFO_H +#define _LIBSPL_SYS_SYSTEMINFO_H #define sysinfo(cmd,buf,cnt) (-1) diff --git a/lib/libspl/include/sys/time.h b/lib/libspl/include/sys/time.h index a61dbd14ba..bb5af8c8b4 100644 --- a/lib/libspl/include/sys/time.h +++ b/lib/libspl/include/sys/time.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_TIME_H -#define _SOL_SYS_TIME_H +#ifndef _LIBSPL_SYS_TIME_H +#define _LIBSPL_SYS_TIME_H #include_next #include diff --git a/lib/libspl/include/sys/types.h b/lib/libspl/include/sys/types.h index e59a3befd8..b166812925 100644 --- a/lib/libspl/include/sys/types.h +++ b/lib/libspl/include/sys/types.h @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _PORT_SYS_TYPES_H -#define _PORT_SYS_TYPES_H +#ifndef _LIBSPL_SYS_TYPES_H +#define _LIBSPL_SYS_TYPES_H #include #include diff --git a/lib/libspl/include/sys/uio.h b/lib/libspl/include/sys/uio.h index ccfc8b7776..0aed91357f 100644 --- a/lib/libspl/include/sys/uio.h +++ b/lib/libspl/include/sys/uio.h @@ -37,8 +37,8 @@ * contributors. */ -#ifndef _SOL_SYS_UIO_H -#define _SOL_SYS_UIO_H +#ifndef _LIBSPL_SYS_UIO_H +#define _LIBSPL_SYS_UIO_H /* struct iovec is defined in glibc's sys/uio.h */ #include_next diff --git a/lib/libspl/include/sys/varargs.h b/lib/libspl/include/sys/varargs.h index 19b81c0855..b8a63d8d77 100644 --- a/lib/libspl/include/sys/varargs.h +++ b/lib/libspl/include/sys/varargs.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_VARARGS_H -#define _SOL_SYS_VARARGS_H +#ifndef _LIBSPL_SYS_VARARGS_H +#define _LIBSPL_SYS_VARARGS_H #endif diff --git a/lib/libspl/include/sys/zone.h b/lib/libspl/include/sys/zone.h index 85b0150bd9..ea7c8bde38 100644 --- a/lib/libspl/include/sys/zone.h +++ b/lib/libspl/include/sys/zone.h @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#ifndef _SOL_SYS_ZONE_H -#define _SOL_SYS_ZONE_H +#ifndef _LIBSPL_SYS_ZONE_H +#define _LIBSPL_SYS_ZONE_H #endif