KDE_EXPORT in kdelibs and winposix

Ralf Habacker ralf.habacker at freenet.de
Thu Feb 9 23:36:47 CET 2006


Brad King schrieb:
> Brad King wrote:
>   
>> Ralf Habacker wrote:
>>     
>>> Brad King schrieb:
>>>       
>>>> I suggest that the winposix_export.h versions be renamed to 
>>>> WINPOSX_EXPORT and WINPOSX_IMPORT
>>>>         
>>> I agree
>>>       
>> Thanks for making the changes, but there is one problem.  Now nothing 
>> defines KDE_IMPORT.  I think it should be defined in kdemacros.h next to 
>> KDE_EXPORT.
>>     
>
> There is also an inconsistency in the definition of KICE_EXPORT:
>
> // dcop/KDE-ICE/KICE.h
> #ifndef KICE_EXPORT
> # ifdef MAKE_DCOP_LIB
> # define KICE_EXPORT KDE_EXPORT
> # else
> # define KICE_EXPORT KDE_IMPORT
> # endif
> #endif
>
> // kdelibs_export_win.h
> #ifndef KICE_EXPORT
> # ifdef MAKE_KICE_LIB
> #  define KICE_EXPORT KDE_EXPORT
> # else
> #  define KICE_EXPORT KDE_IMPORT
> # endif
> #endif
>
> The patch below works-around the problem the same way bksys does but I 
> think the KICE.h version should be moved to kdelibs_export_win.h (and 
> later kdelibs_export.h).
>
>   
The definition is moved to kdelibs_export_win.h in svn.

> -Brad
>
>
> Index: dcop/CMakeLists.txt
> ===================================================================
> --- dcop/CMakeLists.txt (revision 507708)
> +++ dcop/CMakeLists.txt (working copy)
> @@ -87,7 +87,7 @@
>      set(LINK_WITH_kICE kICE)
>   else(UNIX)
>      add_definitions(-DICE_t -DTRANS_SERVER -DTRANS_CLIENT -DANSICPP)
> -   add_definitions(-DSOCKCONN -DTCPCONN)
> +   add_definitions(-DSOCKCONN -DTCPCONN -DKICE_EXPORT=DCOP_EXPORT)
>      set(DCOP_LIB_SRCS ${DCOP_LIB_SRCS} ${kICE_STAT_SRCS})
>      set(LINK_WITH_kICE )
>   endif(UNIX)
> _______________________________________________
> Kde-buildsystem mailing list
> Kde-buildsystem at kde.org
> https://mail.kde.org/mailman/listinfo/kde-buildsystem
>   

Looks good to me, feel free to checkin.

Ralf



More information about the Kde-buildsystem mailing list