Using config_xxx.h instead of -DHAVE_XXX

Lubos Lunak l.lunak at suse.cz
Fri Dec 7 10:56:22 PST 2012


On Friday 07 of December 2012, Norbert Thiebaud wrote:
> On Fri, Dec 7, 2012 at 11:42 AM, Lubos Lunak <l.lunak at suse.cz> wrote:
> >  There are more such -D options that could be changed, although with some
> > it'd be better be careful, e.g. OSL_DEBUG can't go there, because it can
> > be overriden by command-line,
>
> That is a case of addinf a guard in config.h
> #ifndef HAVE_FOO
> #define HAVE_FOO <0|1>
> #endif
>
> and always use these HAVE_xx
> with
> #if HAVE_  #if !HAVE_
>
> rather than
> #ifdef HAVE_
> #ifndef HAVE_

 I don't know what you are referring to exactly with this. It's true that it's 
safer to use #if HAVE rather than #ifdef, but I didn't want to mix it 
together with this change. It can be done independently. Or if this was about 
OSL_DEBUG, I except it can be probably moved there, but I again didn't want 
to complicate this.

> >and I'm not sure if adding #include
> > <config_global.h> to sal/config.h would be really included everywhere
> > where needed.
>
> One remark...
> can we generate these in $WORKDIR   like $WORKDIR/inc/config/* or
> something to that effect
> and have
> #include <config/vckplug.h>
> rather than include <config_vclplug.h>
> ?

 They can't be in $WORKDIR, because it's like with config_host.mk - that one 
also survives make clean.

> and we could also mandate that every source need to include
> #include <config/lo.h>
> or some some other thoroughly bikesheded name
> which would in turn include  the global config, sal/config and other
> fundamental includes

 I seem to remember somebody has already said that this file is in fact 
sal/config.h , I'd just prefer to hear to for sure instead of seeming to 
remember it.

 In other news, I've already committed the two patches by mistake, so I'll 
keep them in unless somebody finds out something wrong with them.

-- 
 Lubos Lunak
 l.lunak at suse.cz


More information about the LibreOffice mailing list