Why is the db.h include even in apu.h ? Why not in apr_dbm_private.h ? That ought to simplify the whole mess.
Cheers, -g On Sat, Jan 19, 2002 at 05:15:56AM -0000, [EMAIL PROTECTED] wrote: > ianh 02/01/18 21:15:56 > > Modified: dbm apr_dbm_berkeleydb.c > include apu.h.in apu.hnw apu.hw > Log: > make the berkeleyDB db.h include private. > (only include it in the code which requires it) > > Revision Changes Path > 1.15 +1 -0 apr-util/dbm/apr_dbm_berkeleydb.c > > Index: apr_dbm_berkeleydb.c > =================================================================== > RCS file: /home/cvs/apr-util/dbm/apr_dbm_berkeleydb.c,v > retrieving revision 1.14 > retrieving revision 1.15 > diff -u -r1.14 -r1.15 > --- apr_dbm_berkeleydb.c 18 Jan 2002 00:43:46 -0000 1.14 > +++ apr_dbm_berkeleydb.c 19 Jan 2002 05:15:55 -0000 1.15 > @@ -55,6 +55,7 @@ > #include "apr_strings.h" > #define APR_WANT_MEMFUNC > #include "apr_want.h" > +#define APU_DBM_BERKELEYDB_PRIVATE 1 > > #if APR_HAVE_STDLIB_H > #include <stdlib.h> /* for abort() */ > > > > 1.11 +3 -0 apr-util/include/apu.h.in > > Index: apu.h.in > =================================================================== > RCS file: /home/cvs/apr-util/include/apu.h.in,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -r1.10 -r1.11 > --- apu.h.in 9 Dec 2001 20:19:43 -0000 1.10 > +++ apu.h.in 19 Jan 2002 05:15:56 -0000 1.11 > @@ -116,8 +116,11 @@ > #define APU_HAVE_DB @apu_have_db@ > > #if APU_HAVE_DB > +#if APU_DBM_BERKELEYDB_PRIVATE > /* found version @apu_db_version@ */ > +/* this is only required for compiling dbm/apr_dbm_berkeleydb */ > #include <@apu_db_header@> > +#endif > #endif > > > > > > 1.2 +3 -0 apr-util/include/apu.hnw > > Index: apu.hnw > =================================================================== > RCS file: /home/cvs/apr-util/include/apu.hnw,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- apu.hnw 30 Nov 2001 19:06:09 -0000 1.1 > +++ apu.hnw 19 Jan 2002 05:15:56 -0000 1.2 > @@ -116,8 +116,11 @@ > #define APU_HAVE_DB 0 > > #if APU_HAVE_DB > +#if APU_DBM_BERKELEYDB_PRIVATE > +/* this is only required for compiling dbm/apr_dbm_berkeleydb */ > /* found version @db_version@ */ > #include <db.h> > +#endif > #endif > > > > > > 1.6 +3 -0 apr-util/include/apu.hw > > Index: apu.hw > =================================================================== > RCS file: /home/cvs/apr-util/include/apu.hw,v > retrieving revision 1.5 > retrieving revision 1.6 > diff -u -r1.5 -r1.6 > --- apu.hw 28 Nov 2001 17:34:18 -0000 1.5 > +++ apu.hw 19 Jan 2002 05:15:56 -0000 1.6 > @@ -147,8 +147,11 @@ > #define APU_HAVE_DB 0 > > #if APU_HAVE_DB > +#if APU_DBM_BERKELEYDB_PRIVATE > +/* this is only required for compiling dbm/apr_dbm_berkeleydb */ > /* win32 note.. you will need to change this for db1 */ > #include <db.h> > +#endif > #endif > > > > > -- Greg Stein, http://www.lyra.org/
