summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-30 02:48:55 (UTC)
committer mickeyl <mickeyl>2003-03-30 02:48:55 (UTC)
commit1d5a00fa8db662c4a5f6490d26d4e2ef1836f118 (patch) (side-by-side diff)
treef805788cab0fb5395e1e2e9c6e18b3644c9b91e6
parent35e4d0b2a71b8ca15baeb0b0383af21fc1d8d3ae (diff)
downloadopie-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*
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oglobalsettings.cpp6
-rw-r--r--libopie2/opienet/onetwork.cpp3
-rw-r--r--libopie2/opienet/onetwork.h8
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
@@ -469,15 +469,15 @@ void OGlobalSettings::initStatic() // should be called initPaths(). Don't put an
//if (kapp)
//kapp->addKipcEventMask(KIPC::SettingsChanged);
}
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 );
}
void OGlobalSettings::rereadFontSettings()
{
delete _generalFont;
_generalFont = 0L;
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
@@ -48,12 +48,13 @@
#include <cstdlib>
#include <math.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
+#include <linux/sockios.h>
#include <linux/wireless.h>
using namespace std;
/*======================================================================================
* ONetwork
@@ -722,13 +723,13 @@ void OHostAPMonitoringInterface::setEnabled( bool b )
// Wireless Extensions < Version 15 need iwpriv commandos for monitoring
#if WIRELESS_EXT > 14
_if->_iwr.u.mode = IW_MODE_MONITOR;
_if->wioctl( SIOCSIWMODE );
#else
- int* args = (int*) &_if._iwr.u.name;
+ int* args = (int*) &_if->_iwr.u.name;
args[0] = 2;
args[1] = 0;
_if->wioctl( SIOCDEVPRIVATE );
#endif
OMonitoringInterface::setEnabled( b );
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
@@ -45,16 +45,24 @@
#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>
#include <net/if.h>
+#ifndef SIOCIWFIRSTPRIV
+#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
+#endif
+
class ONetworkInterface;
class OWirelessNetworkInterface;
class OChannelHopper;
class OMonitoringInterface;
typedef struct ifreq ifreqstruct;