[Commit-gnuradio] r3914 - in gnuradio/branches/releases/3.0: config usrp/host/lib

[jcorgan]

Author: jcorgan
Date: 2006-10-31 16:15:52 -0700 (Tue, 31 Oct 2006)
New Revision: 3914

Modified:
   gnuradio/branches/releases/3.0/config/grc_usrp.m4
   gnuradio/branches/releases/3.0/usrp/host/lib/fusb_linux.cc
Log:
Applied changeset r3886 on trunk to release branch.

Modified: gnuradio/branches/releases/3.0/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/releases/3.0/config/grc_usrp.m4   2006-10-31 22:41:22 UTC 
(rev 3913)
+++ gnuradio/branches/releases/3.0/config/grc_usrp.m4   2006-10-31 23:15:52 UTC 
(rev 3914)
@@ -49,7 +49,7 @@
 
     # 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])
 

Modified: gnuradio/branches/releases/3.0/usrp/host/lib/fusb_linux.cc
===================================================================
--- gnuradio/branches/releases/3.0/usrp/host/lib/fusb_linux.cc  2006-10-31 
22:41:22 UTC (rev 3913)
+++ gnuradio/branches/releases/3.0/usrp/host/lib/fusb_linux.cc  2006-10-31 
23:15:52 UTC (rev 3914)
@@ -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>