| author | mickeyl <mickeyl> | 2003-03-30 13:52:20 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-03-30 13:52:20 (UTC) |
| commit | 9e3dc048e171af6d88f0cc3f16ad0c9fb6a15ce2 (patch) (side-by-side diff) | |
| tree | 2d3bd9b940729878f96d5dc2f2ef9fd22478f3f0 /libopie2/opienet/onetwork.h | |
| parent | 3065a1c13bec5d0b101bec48ff666d45a02ce8a6 (diff) | |
| download | opie-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.
| -rw-r--r-- | libopie2/opienet/onetwork.h | 13 |
1 files changed, 8 insertions, 5 deletions
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 |