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

Re: can't build today's trunk... bdb error.

From: Branko ─îibej <brane_at_xbc.nu>
Date: 2006-01-25 23:10:23 CET

Ben Collins-Sussman wrote:
> This is a RH9 system which comes pre-installed with BDB 4.0 in
> /usr/lib. I've got apache 2.2 (with apr/apu 1.2) installed as well.
>
> subversion/libsvn_fs_base/bdb/env.c:468: structure has no member named
> `get_flags'
>
> I'm guessing this is a result of Branko's recent changes to support BDB 4.4?
>
Yah. Can you try this patch?

Index: env.c
===================================================================
--- env.c (revision 18240)
+++ env.c (working copy)
@@ -460,8 +460,10 @@
   bdb_env_t *bdb = apr_hash_get(bdb_cache, keyp, sizeof *keyp);
   if (bdb && bdb->env)
     {
+ *panicp = !!svn__atomic_read(&bdb->panic);
+#if SVN_BDB_AUTO_RECOVER
+ {
       u_int32_t flags;
- *panicp = !!svn__atomic_read(&bdb->panic);
       if (!*panicp
           && (bdb->env->get_flags(bdb->env, &flags)
               || (flags & DB_PANIC_ENVIRONMENT)))
@@ -473,6 +477,8 @@
           *panicp = TRUE;
           bdb = NULL;
         }
+ }
+#endif /* SVN_BDB_AUTO_RECOVER */
     }
   else
     {

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 25 23:11:54 2006

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