[Glibc-bsd-commits] r5314 - in trunk/freebsd-glue: debian src/freebsd-glue

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-08 11:59:48 +0000 (Wed, 08 Jan 2014)
New Revision: 5314

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/src/freebsd-glue/feature_present.c
   trunk/freebsd-glue/src/freebsd-glue/getosreldate.c
Log:
Only include <sys/sysctl.h> when needed (should fix FTBFS on hurd-i386).

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2014-01-08 09:11:49 UTC (rev 5313)
+++ trunk/freebsd-glue/debian/changelog	2014-01-08 11:59:48 UTC (rev 5314)
@@ -1,3 +1,10 @@
+freebsd-glue (0.2.16) UNRELEASED; urgency=low
+
+  * Only include <sys/sysctl.h> when needed (should fix FTBFS on
+    hurd-i386).
+
+ -- Robert Millan <rmh at debian.org>  Wed, 08 Jan 2014 12:59:25 +0100
+
 freebsd-glue (0.2.15) unstable; urgency=low
 
   * Fix /usr/lib/freebsd/bmake permissions.

Modified: trunk/freebsd-glue/src/freebsd-glue/feature_present.c
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/feature_present.c	2014-01-08 09:11:49 UTC (rev 5313)
+++ trunk/freebsd-glue/src/freebsd-glue/feature_present.c	2014-01-08 11:59:48 UTC (rev 5314)
@@ -30,12 +30,15 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <sys/sysctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD_kernel__
+#include <sys/sysctl.h>
+#endif
+
 /*
  * Returns true if the named feature is present in the currently
  * running kernel.  A feature's presence is indicated by an integer

Modified: trunk/freebsd-glue/src/freebsd-glue/getosreldate.c
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/getosreldate.c	2014-01-08 09:11:49 UTC (rev 5313)
+++ trunk/freebsd-glue/src/freebsd-glue/getosreldate.c	2014-01-08 11:59:48 UTC (rev 5314)
@@ -28,9 +28,12 @@
  */
 
 #include <stddef.h>
-#include <sys/sysctl.h>
 #include <stdlib.h>
 
+#ifdef __FreeBSD_kernel__
+#include <sys/sysctl.h>
+#endif
+
 int
 getosreldate(void)
 {