| -rw-r--r-- | libopie2/opienet/onetwork.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index eb9d506..cfb999d 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
| @@ -46,13 +46,6 @@ | |||
| 46 | #include <qobject.h> | 46 | #include <qobject.h> |
| 47 | #include <qhostaddress.h> | 47 | #include <qhostaddress.h> |
| 48 | 48 | ||
| 49 | #ifndef IFNAMSIZ | ||
| 50 | #define IFNAMSIZ 16 | ||
| 51 | #endif | ||
| 52 | #ifndef IW_MAX_PRIV_DEF | ||
| 53 | #define IW_MAX_PRIV_DEF 128 | ||
| 54 | #endif | ||
| 55 | |||
| 56 | // ML: Yeah, I hate to include kernel headers, but it's necessary here | 49 | // ML: Yeah, I hate to include kernel headers, but it's necessary here |
| 57 | // ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h> | 50 | // ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h> |
| 58 | // ML: which conflicts with the user header <net/if.h> | 51 | // ML: which conflicts with the user header <net/if.h> |
| @@ -60,6 +53,14 @@ | |||
| 60 | // ML: I will drop Jean a mail on that subject | 53 | // ML: I will drop Jean a mail on that subject |
| 61 | 54 | ||
| 62 | #include <net/if.h> | 55 | #include <net/if.h> |
| 56 | |||
| 57 | #ifndef IFNAMSIZ | ||
| 58 | #define IFNAMSIZ 16 | ||
| 59 | #endif | ||
| 60 | #ifndef IW_MAX_PRIV_DEF | ||
| 61 | #define IW_MAX_PRIV_DEF 128 | ||
| 62 | #endif | ||
| 63 | |||
| 63 | #define _LINUX_IF_H | 64 | #define _LINUX_IF_H |
| 64 | #include <linux/wireless.h> | 65 | #include <linux/wireless.h> |
| 65 | 66 | ||