yet more fixes for gcc 2.9x and for our ancient wireless extensions on the Z... *sigh*

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
@@ -459,35 +459,35 @@ void OGlobalSettings::initStatic() // should be called initPaths(). Don't put an
     *s_documentPath = config->readEntry( "Documents" , *s_documentPath);
     if ( (*s_documentPath)[0] != '/' )
       s_documentPath->prepend( QDir::homeDirPath() + "/" );
     *s_documentPath = QDir::cleanDirPath( *s_documentPath );
     if ( s_documentPath->right(1) != "/")
         *s_documentPath += "/";
 
     //config->setDollarExpansion(dollarExpansion);
 
     // Make sure this app gets the notifications about those paths
     //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;
     delete _fixedFont;
     _fixedFont = 0L;
     delete _menuFont;
     _menuFont = 0L;
     delete _toolBarFont;
     _toolBarFont = 0L;
     delete _windowTitleFont;
     _windowTitleFont = 0L;
     delete _taskbarFont;
     _taskbarFont = 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
@@ -38,32 +38,33 @@
 /* QT */
 
 #include <qfile.h>
 #include <qtextstream.h>
 
 /* UNIX */
 
 #include <arpa/inet.h>
 #include <cerrno>
 #include <cstring>
 #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
  *======================================================================================*/
 
 ONetwork* ONetwork::_instance = 0;
 
 ONetwork::ONetwork()
 {
     qDebug( "ONetwork::ONetwork()" );
     synchronize();
 }
 
@@ -712,33 +713,33 @@ OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface
     iface->setMonitoring( this );
 }
 
 OHostAPMonitoringInterface::~OHostAPMonitoringInterface()
 {
 }
 
 void OHostAPMonitoringInterface::setEnabled( bool b )
 {
     // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
     // 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 );
 }
 
 
 QString OHostAPMonitoringInterface::name() const
 {
     return "hostap";
 }
 
 
 /*======================================================================================
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
@@ -35,36 +35,44 @@
 #define ONETWORK_H
 
 /* QT */
 
 #include <qdict.h>
 #include <qmap.h>
 #include <qobject.h>
 #include <qhostaddress.h>
 
 /* OPIE */
 
 #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;
 typedef struct iwreq iwreqstruct;
 typedef struct iw_event iweventstruct;
 typedef struct iw_freq iwfreqstruct;
 typedef struct iw_priv_args iwprivargsstruct;
 typedef struct iw_range iwrangestruct;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/