conditionalize include of linux/compiler.h

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3886 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 8c1b118bc2c1ca1cf51feaca81c7331136900341..a7c0cf138ca2e025b7130c02ef4b182d42e2dce5 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -49,7 +49,7 @@ AC_DEFUN([GRC_USRP],[
 
     # These checks don't fail
     AC_C_BIGENDIAN
-    AC_CHECK_HEADERS([byteswap.h])
+    AC_CHECK_HEADERS([byteswap.h linux/compiler.h])
     AC_CHECK_FUNCS([getrusage sched_setscheduler])
     AC_CHECK_FUNCS([sigaction snprintf])
 

diff --git a/usrp/host/lib/fusb_linux.cc b/usrp/host/lib/fusb_linux.cc
index 8391f66b2ec813270a88ac031aa6ea800546b09b..1eaba4e508e70db5ea0dd7082d3bf272c9644dac 100644 (file)
--- a/usrp/host/lib/fusb_linux.cc
+++ b/usrp/host/lib/fusb_linux.cc
@@ -27,7 +27,9 @@
 #include <fusb_linux.h>
 #include <usb.h>               // libusb header
 #include <stdexcept>
+#ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>
+#endif
 #include <linux/usbdevice_fs.h>        // interface to kernel portion of user mode usb driver
 #include <sys/ioctl.h>
 #include <assert.h>