summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-30 02:48:55 (UTC)
committer mickeyl <mickeyl>2003-03-30 02:48:55 (UTC)
commit1d5a00fa8db662c4a5f6490d26d4e2ef1836f118 (patch) (unidiff)
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) (show 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
@@ -472,9 +472,9 @@ void OGlobalSettings::initStatic() // should be called initPaths(). Don't put an
472 472
473void OGlobalSettings::initColors() 473void OGlobalSettings::initColors()
474{ 474{
475 if ( not OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 ); 475 if ( !OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 );
476 if ( not OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 ); 476 if ( !OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 );
477 if ( not OpieGray ) OpieGray = new QColor( 220, 210, 215 ); 477 if ( !OpieGray ) OpieGray = new QColor( 220, 210, 215 );
478} 478}
479 479
480void OGlobalSettings::rereadFontSettings() 480void OGlobalSettings::rereadFontSettings()
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
@@ -51,6 +51,7 @@
51#include <sys/socket.h> 51#include <sys/socket.h>
52#include <sys/types.h> 52#include <sys/types.h>
53#include <unistd.h> 53#include <unistd.h>
54#include <linux/sockios.h>
54#include <linux/wireless.h> 55#include <linux/wireless.h>
55 56
56using namespace std; 57using namespace std;
@@ -725,7 +726,7 @@ void OHostAPMonitoringInterface::setEnabled( bool b )
725 _if->_iwr.u.mode = IW_MODE_MONITOR; 726 _if->_iwr.u.mode = IW_MODE_MONITOR;
726 _if->wioctl( SIOCSIWMODE ); 727 _if->wioctl( SIOCSIWMODE );
727 #else 728 #else
728 int* args = (int*) &_if._iwr.u.name; 729 int* args = (int*) &_if->_iwr.u.name;
729 args[0] = 2; 730 args[0] = 2;
730 args[1] = 0; 731 args[1] = 0;
731 _if->wioctl( SIOCDEVPRIVATE ); 732 _if->wioctl( SIOCDEVPRIVATE );
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
@@ -48,10 +48,18 @@
48// ML: Yeah, I hate to include kernel headers, but it's necessary here 48// ML: Yeah, I hate to include kernel headers, but it's necessary here
49// ML: Recent RedHat and MandrakePatches to the Kernel and WE broke something 49// ML: Recent RedHat and MandrakePatches to the Kernel and WE broke something
50// ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h> 50// ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h>
51
52#ifndef IFNAMSIZ
51#define IFNAMSIZ 16 53#define IFNAMSIZ 16
54#endif
55
52#include <linux/wireless.h> 56#include <linux/wireless.h>
53#include <net/if.h> 57#include <net/if.h>
54 58
59#ifndef SIOCIWFIRSTPRIV
60#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
61#endif
62
55class ONetworkInterface; 63class ONetworkInterface;
56class OWirelessNetworkInterface; 64class OWirelessNetworkInterface;
57class OChannelHopper; 65class OChannelHopper;