| -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 @@ -473,7 +473,7 @@ void OGlobalSettings::initStatic() // should be called initPaths(). Don't put an 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 @@ -52,4 +52,5 @@ #include <sys/types.h> #include <unistd.h> +#include <linux/sockios.h> #include <linux/wireless.h> @@ -726,5 +727,5 @@ void OHostAPMonitoringInterface::setEnabled( bool b ) _if->wioctl( SIOCSIWMODE ); #else - int* args = (int*) &_if._iwr.u.name; + int* args = (int*) &_if->_iwr.u.name; args[0] = 2; args[1] = 0; 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 @@ -49,8 +49,16 @@ // 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> #include <net/if.h> +#ifndef SIOCIWFIRSTPRIV +#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE +#endif + class ONetworkInterface; class OWirelessNetworkInterface; |