From 9e3dc048e171af6d88f0cc3f16ad0c9fb6a15ce2 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Sun, 30 Mar 2003 13:52:20 +0000
Subject: introduce a workaround for conflicting user and kernel headers like

<linux/if.h> and <net/if.h>. I really don't like including kernel headers,
but in the case of <linux/wireless.h> there is no other option yet.
---
(limited to 'libopie2/opienet')

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 998b50e..21fa390 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -52,7 +52,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <linux/sockios.h>
-#include <linux/wireless.h>
 
 using namespace std;
 
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 56da5f4..c544454 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -45,16 +45,19 @@
 
 #include <opie2/onetutils.h>
 
-// ML: Yeah, I hate to include kernel headers, but it's necessary here
-// ML: Recent RedHat and MandrakePatches to the Kernel and WE broke something
-// ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h>
-
 #ifndef IFNAMSIZ
 #define IFNAMSIZ 16
 #endif
 
-#include <linux/wireless.h>
+// ML: Yeah, I hate to include kernel headers, but it's necessary here
+// ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h>
+// ML: which conflicts with the user header <net/if.h>
+// ML: We really a user header for the Wireless Extensions, something like <net/wireless.h>
+// ML: I will drop Jean an mail on that subject
+
 #include <net/if.h>
+#define _LINUX_IF_H
+#include <linux/wireless.h>
 
 #ifndef SIOCIWFIRSTPRIV
 #define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
--
cgit v0.9.0.2