summaryrefslogtreecommitdiff
path: root/libopie2
authormickeyl <mickeyl>2003-03-30 13:52:20 (UTC)
committer mickeyl <mickeyl>2003-03-30 13:52:20 (UTC)
commit9e3dc048e171af6d88f0cc3f16ad0c9fb6a15ce2 (patch) (unidiff)
tree2d3bd9b940729878f96d5dc2f2ef9fd22478f3f0 /libopie2
parent3065a1c13bec5d0b101bec48ff666d45a02ce8a6 (diff)
downloadopie-9e3dc048e171af6d88f0cc3f16ad0c9fb6a15ce2.zip
opie-9e3dc048e171af6d88f0cc3f16ad0c9fb6a15ce2.tar.gz
opie-9e3dc048e171af6d88f0cc3f16ad0c9fb6a15ce2.tar.bz2
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.
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/onetwork.cpp1
-rw-r--r--libopie2/opienet/onetwork.h13
2 files changed, 8 insertions, 6 deletions
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 @@
52#include <sys/types.h> 52#include <sys/types.h>
53#include <unistd.h> 53#include <unistd.h>
54#include <linux/sockios.h> 54#include <linux/sockios.h>
55#include <linux/wireless.h>
56 55
57using namespace std; 56using namespace std;
58 57
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 @@
45 45
46#include <opie2/onetutils.h> 46#include <opie2/onetutils.h>
47 47
48// ML: Yeah, I hate to include kernel headers, but it's necessary here
49// ML: Recent RedHat and MandrakePatches to the Kernel and WE broke something
50// ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h>
51
52#ifndef IFNAMSIZ 48#ifndef IFNAMSIZ
53#define IFNAMSIZ 16 49#define IFNAMSIZ 16
54#endif 50#endif
55 51
56#include <linux/wireless.h> 52// ML: Yeah, I hate to include kernel headers, but it's necessary here
53// ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h>
54// ML: which conflicts with the user header <net/if.h>
55// ML: We really a user header for the Wireless Extensions, something like <net/wireless.h>
56// ML: I will drop Jean an mail on that subject
57
57#include <net/if.h> 58#include <net/if.h>
59#define _LINUX_IF_H
60#include <linux/wireless.h>
58 61
59#ifndef SIOCIWFIRSTPRIV 62#ifndef SIOCIWFIRSTPRIV
60#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE 63#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE