From 1d5a00fa8db662c4a5f6490d26d4e2ef1836f118 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Sun, 30 Mar 2003 02:48:55 +0000
Subject: yet more fixes for gcc 2.9x and for our ancient wireless extensions on the Z... *sigh*

---
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
 
 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()
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 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <linux/sockios.h>
 #include <linux/wireless.h>
 
 using namespace std;
@@ -725,7 +726,7 @@ void OHostAPMonitoringInterface::setEnabled( bool b )
     _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 );
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 @@
 // 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;
--
cgit v0.9.0.2