-rw-r--r-- | libopie2/opienet/onetwork.cpp | 1 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 13 |
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 | |||
@@ -54,3 +54,2 @@ | |||
54 | #include <linux/sockios.h> | 54 | #include <linux/sockios.h> |
55 | #include <linux/wireless.h> | ||
56 | 55 | ||
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 | |||
@@ -47,6 +47,2 @@ | |||
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 |
@@ -55,4 +51,11 @@ | |||
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 | ||