[PATCH] Fix kdenetwork/wifi compilation with iwlib27

Piotr Szymanski djurban at websites.pl
Mon Mar 1 14:20:56 GMT 2004


Hi,
Dominique Devriese(Sunday 29 of February 2004 12:18):
> 2 In your patch, the configure check is a bit superfluous, since libiw
>   already has a VERSION_WT macro defined.
AFAIR it is an internal constant not defined in libiw.h nor wireless.h which 
are the only installed headers there:

[djurban at djurban][15:16:19](~)$ rpm -q libiw-devel
libiw-devel-27-0.1
[djurban at djurban][15:16:20](~)$ rpm -ql libiw libiw-devel|grep h
/usr/include/iwlib.h
/usr/include/wireless.h
[djurban at djurban][15:16:34](~)$ grep VERSION /usr/include/iwlib.h
#ifndef LINUX_VERSION_CODE
    && LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0) \
      && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
      && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) \
      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0)
#elif defined(_LINUX_C_LIB_VERSION_MAJOR) \
      && _LINUX_C_LIB_VERSION_MAJOR == 5 \
      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0) \
      && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
[djurban at djurban][15:16:40](~)$ grep VERSION /usr/include/wireless.h
/***************************** VERSION *****************************/
[djurban at djurban][15:16:43](~)$

> 3 AFAICS, Your patch only fixes the problems in
>   kdenetwork/wifi/kwireless/linuxwirelesswidget.cpp, not
>   in kdenetwork/wifi/wirelesstools.cpp, which still contained
>   iw_get_stats in KDE_3_2_BRANCH.
It worked here in PLD Linux, which version do you have?

> 1 in HEAD, libiw.c source has been included in the
>   kdenetwork/wifi/libiw.cpp source
i dont like this, programs should you system libs and only falback to internal 
files if they dont find any...

> 2 my patch fixes kdenetwork/wifi/wirelesstools.cpp in 3_2_BRANCH
I was sure I fixed those too, but it seems you're right, my bad.
-- 
Piotr Szymanski
djurban at pld-linux.org




More information about the kde-core-devel mailing list