[Glibc-bsd-commits] r4861 - in trunk/freebsd-glue: debian include/sys

[Robert Millan]

Author: rmh
Date: 2013-08-04 16:21:28 +0000 (Sun, 04 Aug 2013)
New Revision: 4861

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/include/sys/time.h
   trunk/freebsd-glue/include/sys/types.h
Log:
Put includes of <sys/kern/*.h> OUTSIDE the header protection (which they intentionally duplicate).

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-08-04 16:08:58 UTC (rev 4860)
+++ trunk/freebsd-glue/debian/changelog	2013-08-04 16:21:28 UTC (rev 4861)
@@ -1,3 +1,10 @@
+freebsd-glue (0.1.1) UNRELEASED; urgency=low
+
+  * Put includes of <sys/kern/*.h> OUTSIDE the header protection (which
+    they intentionally duplicate).
+
+ -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 18:20:40 +0200
+
 freebsd-glue (0.1.0) unstable; urgency=low
 
   * Fix header pollution in <unistd.h> by moving non-trivial inline

Modified: trunk/freebsd-glue/include/sys/time.h
===================================================================
--- trunk/freebsd-glue/include/sys/time.h	2013-08-04 16:08:58 UTC (rev 4860)
+++ trunk/freebsd-glue/include/sys/time.h	2013-08-04 16:21:28 UTC (rev 4861)
@@ -1,9 +1,9 @@
 #include_next <sys/time.h>
 
-#ifndef _SYS_TIME_H_
 # ifdef __FreeBSD_kernel__
 #  include <sys/kern/time.h>
 # else
+#ifndef _SYS_TIME_H_
 #  define _SYS_TIME_H_
 
 /* On FreeBSD, <sys/time.h> is expected to CLOCK_MONOTONIC, etc,
@@ -15,6 +15,6 @@
 /* FreeBSD code expects that this file includes... */
 #  include <sys/types.h>
 
-# endif
+#endif /* _SYS_TIME_H_ */
 
-#endif
+#endif /* __FreeBSD_kernel__ */

Modified: trunk/freebsd-glue/include/sys/types.h
===================================================================
--- trunk/freebsd-glue/include/sys/types.h	2013-08-04 16:08:58 UTC (rev 4860)
+++ trunk/freebsd-glue/include/sys/types.h	2013-08-04 16:21:28 UTC (rev 4861)
@@ -1,10 +1,9 @@
 #include_next <sys/types.h>
 
-#ifndef _SYS_TYPES_H_
-
 # ifdef __FreeBSD_kernel__
 #  include <sys/kern/types.h>
 # else
+#  ifndef _SYS_TYPES_H_
 #  define _SYS_TYPES_H_
 #  include <sys/cdefs.h>
 #  include <stdint.h> /* uintXX_t */
@@ -12,6 +11,7 @@
 /* Emulate implicit includes on FreeBSD */
 #  include <machine/endian.h>
 #  include <sys/select.h>
-# endif
 
-#endif
+#endif /* _SYS_TYPES_H_ */
+
+#endif /* __FreeBSD_kernel__ */