KDE_3_2_BRANCH: kdenetwork/wifi

[Dominique Devriese <devriese@kde.org>]

CVS commit by domi: 

The wireless-tools people managed to change their interfaces around.
Someone with more knowledge of this code should look into moving to
use the new iw_range interfaces.

This commit fixes compilation with libiw27

CCMAIL:debian-qt-kde@lists.debian.org


  M +18 -3     wirelesstools.cpp   1.1.2.3


--- kdenetwork/wifi/wirelesstools.cpp  #1.1.2.2:1.1.2.3
@@ -29,4 +29,19 @@
 #include "wirelesstools.h"
 
+// domi:the wireless-tools people managed to change their interfaces
+// around.  Someone with more knowledge of this code should look into
+// moving to use the new iw_range interfaces.
+#if WT_VERSION >= 27
+inline int wtc_private_iw_get_stats( int skfd, char* ifname, iwstats* stats )
+{
+  return iw_get_stats( skfd, ifname, stats, 0, 0 );
+}
+#else
+inline int wtc_private_iw_get_stats( int skfd, char* ifname, iwstats* stats )
+{
+  return iw_get_stats( skfd, ifname, stats );
+}
+#endif
+
 /* ================================== FROM IWCONFIG.C ================================== */
 int get_info(int skfd, char * ifname, struct wireless_info * info)
@@ -172,5 +187,5 @@ int get_info(int skfd, char * ifname, st
 
   /* Get stats */
-  if(iw_get_stats(skfd, ifname, &(info->stats)) >= 0)
+  if(wtc_private_iw_get_stats(skfd, ifname, &(info->stats)) >= 0)
     {
       info->has_stats = 1;
@@ -216,5 +231,5 @@ return_info (deviceinfo * transfer, bool
               char device[128];
               snprintf(device,128,"%s",(*it).latin1());
-              iw_get_stats (transfer->skfd, device, tempic2);
+              wtc_private_iw_get_stats (transfer->skfd, device, tempic2);
               kdDebug() << "Found!\n";
         already_warned=false;
@@ -276,5 +291,5 @@ return_info (deviceinfo * transfer, bool
           char device[128];
           snprintf(device,128,"%s",transfer->used_interface.latin1());
-          iw_get_stats (transfer->skfd, device, tempic2);
+          wtc_private_iw_get_stats (transfer->skfd, device, tempic2);
           transfer->has_freq = tempic1->has_freq;
           transfer->freq = tempic1->freq;