| author | mickeyl <mickeyl> | 2003-03-30 02:48:55 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-03-30 02:48:55 (UTC) |
| commit | 1d5a00fa8db662c4a5f6490d26d4e2ef1836f118 (patch) (side-by-side diff) | |
| tree | f805788cab0fb5395e1e2e9c6e18b3644c9b91e6 | |
| parent | 35e4d0b2a71b8ca15baeb0b0383af21fc1d8d3ae (diff) | |
| download | opie-1d5a00fa8db662c4a5f6490d26d4e2ef1836f118.zip opie-1d5a00fa8db662c4a5f6490d26d4e2ef1836f118.tar.gz opie-1d5a00fa8db662c4a5f6490d26d4e2ef1836f118.tar.bz2 | |
yet more fixes for gcc 2.9x and for our ancient wireless extensions on the Z... *sigh*
| -rw-r--r-- | libopie2/opiecore/oglobalsettings.cpp | 6 | ||||
| -rw-r--r-- | libopie2/opienet/onetwork.cpp | 3 | ||||
| -rw-r--r-- | libopie2/opienet/onetwork.h | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp index 184ee69..1799529 100644 --- a/libopie2/opiecore/oglobalsettings.cpp +++ b/libopie2/opiecore/oglobalsettings.cpp @@ -474,5 +474,5 @@ void OGlobalSettings::initColors() { - if ( not OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 ); - if ( not OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 ); - if ( not OpieGray ) OpieGray = new QColor( 220, 210, 215 ); + if ( !OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 ); + if ( !OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 ); + if ( !OpieGray ) OpieGray = new QColor( 220, 210, 215 ); } diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 25c70e0..998b50e 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -53,2 +53,3 @@ #include <unistd.h> +#include <linux/sockios.h> #include <linux/wireless.h> @@ -727,3 +728,3 @@ void OHostAPMonitoringInterface::setEnabled( bool b ) #else - int* args = (int*) &_if._iwr.u.name; + int* args = (int*) &_if->_iwr.u.name; args[0] = 2; diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index 936ac85..56da5f4 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h @@ -50,3 +50,7 @@ // ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h> + +#ifndef IFNAMSIZ #define IFNAMSIZ 16 +#endif + #include <linux/wireless.h> @@ -54,2 +58,6 @@ +#ifndef SIOCIWFIRSTPRIV +#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE +#endif + class ONetworkInterface; |