Cleanup some of the #ifndef/#defines
This commit is contained in:
parent
07394c4b64
commit
6d524f2906
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
#include_next <assert.h>
|
#include_next <assert.h>
|
||||||
|
|
||||||
#ifndef _SOL_ASSERT_H
|
#ifndef _LIBSPL_ASSERT_H
|
||||||
#define _SOL_ASSERT_H
|
#define _LIBSPL_ASSERT_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -91,4 +91,4 @@ _NOTE(CONSTCOND) } while (0)
|
||||||
#define ASSERT3P(x, y, z) VERIFY3P(x, y, z)
|
#define ASSERT3P(x, y, z) VERIFY3P(x, y, z)
|
||||||
#endif /* NDEBUG */
|
#endif /* NDEBUG */
|
||||||
|
|
||||||
#endif /* _SOL_ASSERT_H */
|
#endif /* _LIBSPL_ASSERT_H */
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
#include_next <stdlib.h>
|
#include_next <stdlib.h>
|
||||||
|
|
||||||
#ifndef _SOL_STDLIB_H
|
#ifndef _LIBSPL_STDLIB_H
|
||||||
#define _SOL_STDLIB_H
|
#define _LIBSPL_STDLIB_H
|
||||||
|
|
||||||
extern const char *getexecname(void);
|
extern const char *getexecname(void);
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
* Use is subject to license terms.
|
* Use is subject to license terms.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SOL_STRING_H
|
#ifndef _LIBSPL_STRING_H
|
||||||
#define _SOL_STRING_H
|
#define _LIBSPL_STRING_H
|
||||||
|
|
||||||
#include_next <string.h>
|
#include_next <string.h>
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
* Use is subject to license terms.
|
* Use is subject to license terms.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SOL_STRINGS_H
|
#ifndef _LIBSPL_STRINGS_H
|
||||||
#define _SOL_STRINGS_H
|
#define _LIBSPL_STRINGS_H
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include_next <strings.h>
|
#include_next <strings.h>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
* Use is subject to license terms.
|
* Use is subject to license terms.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SOL_SYNCH_H
|
#ifndef _LIBSPL_SYNCH_H
|
||||||
#define _SOL_SYNCH_H
|
#define _LIBSPL_SYNCH_H
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
* Use is subject to license terms.
|
* Use is subject to license terms.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SOL_UCRED_H
|
#ifndef _LIBSPL_UCRED_H
|
||||||
#define _SOL_UCRED_H
|
#define _LIBSPL_UCRED_H
|
||||||
|
|
||||||
typedef int ucred_t;
|
typedef int ucred_t;
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
* Use is subject to license terms.
|
* Use is subject to license terms.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SOL_UMEM_H
|
#ifndef _LIBSPL_UMEM_H
|
||||||
#define _SOL_UMEM_H
|
#define _LIBSPL_UMEM_H
|
||||||
|
|
||||||
/* XXX: We should use the real portable umem library if it is detected
|
/* 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
|
* at configure time. However, if the library is not available we can
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
#include_next <unistd.h>
|
#include_next <unistd.h>
|
||||||
|
|
||||||
#ifndef _SYS_UNISTD_H
|
#ifndef _LIBSPL_UNISTD_H
|
||||||
#define _SYS_UNISTD_H
|
#define _LIBSPL_UNISTD_H
|
||||||
|
|
||||||
#include <zfs_config.h>
|
#include <zfs_config.h>
|
||||||
|
|
||||||
|
@ -56,4 +56,4 @@ static inline long fake_gethostid(void)
|
||||||
#define gethostid() fake_gethostid()
|
#define gethostid() fake_gethostid()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* _SYS_UNISTD_H */
|
#endif /* _LIBSPL_UNISTD_H */
|
||||||
|
|
Loading…
Reference in New Issue