From 0920898be2ede72baafa2a02e77ea223ecbe4f9a Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 25 Nov 2010 13:49:16 -0800
Subject: Include <linux/compiler.h> before including <linux/usbdevice_fs.h>.

Some versions of the Linux kernel require that.
---
 pcap-usb-linux.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pcap-usb-linux.c')

diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index daaa900..61695b6 100644
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -61,6 +61,11 @@ static const char rcsid[] _U_ =
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #ifdef HAVE_LINUX_USBDEVICE_FS_H
+/*
+ * We assume that any Linux that supports USB sniffing has <linux/compiler.h>;
+ * we might need it for <linux/usbdevice_fs.h> to define __user.
+ */
+#include <linux/compiler.h>
 #include <linux/usbdevice_fs.h>
 #endif
 
-- 
cgit v1.2.3


From b019cc06cb4fdc01f99a36581fe7b55e2533d663 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 25 Nov 2010 14:06:01 -0800
Subject: Check whether we have <linux/compiler.h>.

Not all distributions have it in /usr/include; I guess the ones that
don't have it have versions of other kernel headers that don't require
it.
---
 pcap-usb-linux.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pcap-usb-linux.c')

diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index 61695b6..f1b430c 100644
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -62,12 +62,14 @@ static const char rcsid[] _U_ =
 #include <sys/mman.h>
 #ifdef HAVE_LINUX_USBDEVICE_FS_H
 /*
- * We assume that any Linux that supports USB sniffing has <linux/compiler.h>;
- * we might need it for <linux/usbdevice_fs.h> to define __user.
+ * We might need <linux/compiler.h> to define __user for
+ * <linux/usbdevice_fs.h>.
  */
+#ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>
+#endif /* HAVE_LINUX_COMPILER_H */
 #include <linux/usbdevice_fs.h>
-#endif
+#endif /* HAVE_LINUX_USBDEVICE_FS_H */
 
 #define USB_IFACE "usbmon"
 #define USB_TEXT_DIR_OLD "/sys/kernel/debug/usbmon"
-- 
cgit v1.2.3