[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35665 - in trunk: . build/ac-macros subversion subversion/libsvn_fs_base subversion/libsvn_fs_base/bdb subversion/libsvn_fs_base/util

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 20 Feb 2009 23:36:01 +0200 (Jerusalem Standard Time)

Julian Foad wrote on Wed, 4 Feb 2009 at 23:44 -0000:
> Chris Foote wrote:
> > > From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta_at_gmail.com>
> > > > The SVN_WANT_BDB define also needs to be added to the lock.c and tree.c files.
> > >
> > > Why? These files weren't changed in r35665 and they seem to not use anything
> > > from db.h.
> >
> > Because when the svn_private_config.h file is included without SVN_WANT_BDB it
> > prevents later includes with SVN_WANT_BDB defined from including db.h.
> >
> > For example in lock.c it includes lock.h which includes trail.h which in turn
> > includes svn_private_config.h (with SVN_WANT_BDB). But since lock.c has
> > already included it without SVN_WANT_BDB it doesn't include db.h.
>
> That sounds like a bug in svn_private_config.h.

Was it fixed?

Daniel

> It should include the
> "wanted" headers every time (and let them do their own double-include
> guarding).
>
> [...]
> > An alternate solution is to move the #ifdef SVN_WANT_BDB block so that it is outside
> > of the #ifndef SVN_PRIVATE_CONFIG_HW block:
> >
> > Index: subversion/svn_private_config.hw
> > ===================================================================
> > --- subversion/svn_private_config.hw (revision 35682)
> > +++ subversion/svn_private_config.hw (working copy)
> > @@ -29,14 +29,6 @@
> > #define SVN_FS_WANT_DB_MINOR 0
> > #define SVN_FS_WANT_DB_PATCH 14
> > -
> > -/* Inclusion of Berkeley DB header */
> > -#ifdef SVN_WANT_BDB
> > -#define APU_WANT_DB
> > -#include <apu_want.h>
> > -#endif
> > -
> > -
> > /* Path separator for local filesystem */
> > #define SVN_PATH_LOCAL_SEPARATOR '\\'
> > @@ -87,3 +79,10 @@
> > #endif
> > #endif /* SVN_PRIVATE_CONFIG_HW */
> > +
> > +
> > +/* Inclusion of Berkeley DB header */
> > +#ifdef SVN_WANT_BDB
> > +#define APU_WANT_DB
> > +#include <apu_want.h>
> > +#endif
>
> Yes, that's right.
>
> - Julian
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1104741
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1200633
Received on 2009-02-20 22:42:21 CET

This is an archived mail posted to the Subversion Dev mailing list.