summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb2006-10-28 01:46:05 +0000
committereb2006-10-28 01:46:05 +0000
commit3695548d8598f524dd203f7dfc4f73f301b7282a (patch)
tree2fd737f215b5e92a6deac64fd0c80599878e8a71
parent80a2360b43dfa95de3a54972120f47112637a266 (diff)
downloadgnuradio-3695548d8598f524dd203f7dfc4f73f301b7282a.tar.gz
gnuradio-3695548d8598f524dd203f7dfc4f73f301b7282a.tar.bz2
gnuradio-3695548d8598f524dd203f7dfc4f73f301b7282a.zip
conditionalize include of linux/compiler.h
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3886 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--config/grc_usrp.m42
-rw-r--r--usrp/host/lib/fusb_linux.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 8c1b118bc..a7c0cf138 100644
--- 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 8391f66b2..1eaba4e50 100644
--- 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>