From 392fe85344cbb9e9e7a3f4d128f0760beaf15d87 Mon Sep 17 00:00:00 2001 From: rmh <rmh@FreeBSD.org> Date: Mon, 30 Apr 2012 23:12:16 +0000 Subject: [PATCH] GNU/kFreeBSD portability fix. This glue <stdlib.h> overrides header protection in the system-wide version of <stdlib.h> by wrapping the #include_next <stdlib.h> within the scope of its own header protection. On FreeBSD this has no effect, since both header protections are equivalent. However the GNU version of <stdlib.h> implements a special header protection mechanism which allows it to be included multiple times (in different modes). Simply by moving the #include_next off the header protection, we allow system-wide <stdlib.h> to implement its own protection policy, whichever that may be. --- cddl/compat/opensolaris/include/stdlib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/compat/opensolaris/include/stdlib.h b/cddl/compat/opensolaris/include/stdlib.h index 4e21ea6280ae..9ba32322c03b 100644 --- a/cddl/compat/opensolaris/include/stdlib.h +++ b/cddl/compat/opensolaris/include/stdlib.h @@ -27,11 +27,11 @@ * */ +#include_next <stdlib.h> + #ifndef _COMPAT_OPENSOLARIS_STDLIB_H_ #define _COMPAT_OPENSOLARIS_STDLIB_H_ -#include_next <stdlib.h> - #define getexecname getprogname #endif