incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ariel Constenla-Haile <ariel.constenla.ha...@gmail.com>
Subject Re: [CODE] tools/solar.h DLLPOSTFIX clean-up
Date Mon, 24 Oct 2011 14:56:37 GMT
Hi Herbert,

On Mon, Oct 24, 2011 at 02:25:13PM +0200, Herbert Duerr wrote:
> On 21.10.2011 16:36, Ariel Constenla-Haile wrote:
> >loading libraries is broken in code that uses the macro SVLIBRARY
> >[...]
> >attached patch removes all DLLPOSTFIXes
> 
> Good catch! Thanks for the patch. Applied as
> http://svn.apache.org/viewvc?rev=1188107&view=rev
> 
> This shows that there was way to much duplication of such stuff. I
> wonder if the many lines could have been merged into something like
> #define __DLLEXTENSION DLLPOSTFIX##DLLPOST

one should also fix the other macros:

#if defined WNT || defined OS2
#define SVLIBRARY( Base ) \
    LIBRARY_CONCAT3( Base, __DLLEXTENSION, ".DLL" )

will end up in cui.dll.DLL for example

the same for 

#define SV_LIBFILENAME(str) \
    LIBRARYFILENAME_CONCAT3( str, __DLLEXTENSION, ".dll" )

and, AFAIK

* in the old build env. DLLPOSTFIX and DLLPOST are just variables, not 
  passed to the compiler as macro definitions, so it seems one should 
  add them in solenv/inc/settings.mk

        CDEFS+=-DDLLPOSTFIX=$(DLLPOSTFIX)
        CDEFS+=-DDLLPOST=$(DLLPOST)

* gbuild knows nothing about DLLPOSTFIX and DLLPOST, this should be
  fixed as well

This all looks a little messy.

Regards
-- 
Ariel Constenla-Haile
La Plata, Argentina

Mime
View raw message