[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/knemo/src/knemod/backends
From:       John Stamp <jstamp () users ! sourceforge ! net>
Date:       2009-10-17 15:03:25
Message-ID: 1255791805.003778.16725.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1036655 by jstamp:

Fix compilation when libiw is missing

 M  +4 -4      netlinkbackend.cpp  
 M  +1 -1      netlinkbackend.h  


--- trunk/extragear/network/knemo/src/knemod/backends/netlinkbackend.cpp \
#1036654:1036655 @@ -23,6 +23,8 @@
 #include <netlink/route/link.h>
 #include <netlink/route/route.h>
 
+#include <net/if.h>
+
 #include <KLocale>
 #include <kio/global.h>
 
@@ -45,7 +47,7 @@
         linkCache = rtnl_link_alloc_cache( rtsock );
         routeCache = rtnl_route_alloc_cache( rtsock );
     }
-#if HAVE_LIBIW
+#ifdef HAVE_LIBIW
     iwfd = iw_sockets_open();
 #endif
 }
@@ -236,9 +238,9 @@
     }
 }
 
+#ifdef HAVE_LIBIW
 void NetlinkBackend::updateWirelessData( int fd, const QString& ifName, BackendData* \
data )  {
-#ifdef HAVE_LIBIW
     if ( fd > 0 )
     {
     // The following code was taken from iwconfig.c and iwlib.c.
@@ -353,10 +355,8 @@
         if ( has_range )
             updateWirelessEncData( fd, ifName, range, data );
     }
-#endif
 }
 
-#ifdef HAVE_LIBIW
 void NetlinkBackend::updateWirelessEncData( int fd, const QString& ifName,
                                         const iw_range& range, BackendData* data )
 {
--- trunk/extragear/network/knemo/src/knemod/backends/netlinkbackend.h \
#1036654:1036655 @@ -51,9 +51,9 @@
 
 private:
     void updateInterfaceData( const QString& ifName, BackendData* data );
-    void updateWirelessData( int fd, const QString& ifName, BackendData* data );
     void updateAddresses( BackendData* data );
 #ifdef HAVE_LIBIW
+    void updateWirelessData( int fd, const QString& ifName, BackendData* data );
     void updateWirelessEncData( int fd, const QString& ifName, const iw_range& \
range, BackendData* data );  #endif
     nl_handle * rtsock;


[prev in list] [next in list] [prev in thread] [next in thread]