X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldbm.h;h=1592c23da5c60d69361e1481ce6d801a85b13b1c;hb=975a5e9a24e971197baa9ea2d4479100977c9060;hp=75004e657f398e000de4b74a98c23dd00879d4c4;hpb=d8c4df6f39d956f775c7966903b3beb466fd1fbb;p=openldap

diff --git a/include/ldbm.h b/include/ldbm.h
index 75004e657f..1592c23da5 100644
--- a/include/ldbm.h
+++ b/include/ldbm.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /* ldbm.h - ldap dbm compatibility routine header file */
 
@@ -15,6 +16,11 @@
 
 #include <ldap_cdefs.h>
 
+/* dummy DB_ENV for non Berkeley DB */
+#if !defined( LDBM_USE_DBBTREE ) && !defined( LDBM_USE_DBHASH )
+#  define DB_ENV void
+#endif
+
 #if defined( LDBM_USE_DBBTREE ) || defined( LDBM_USE_DBHASH )
 
 /*****************************************************************
@@ -48,6 +54,8 @@
 #	ifndef DEFAULT_DB_PAGE_SIZE
 #		define DEFAULT_DB_PAGE_SIZE 4096
 #	endif
+#else
+#  define DB_ENV void
 #endif
 
 
@@ -119,8 +127,6 @@ typedef datum		Datum;
 typedef Datum LDBMCursor;
 typedef GDBM_FILE	LDBM;
 
-extern gdbm_error	gdbm_errno;
-
 LDAP_END_DECL
 
 /* for ldbm_open */
@@ -171,7 +177,7 @@ typedef int LDBMCursor;
 typedef MDBM		*LDBM;
 
 LDAP_END_DECL
-    
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -239,8 +245,11 @@ LDAP_BEGIN_DECL
 LDAP_LDBM_F (int) ldbm_initialize( const char * );
 LDAP_LDBM_F (int) ldbm_shutdown( void );
 
+LDAP_LDBM_F (DB_ENV*) ldbm_initialize_env(const char *, int dbcachesize, int *envdirok);
+LDAP_LDBM_F (void) ldbm_shutdown_env(DB_ENV *);
+
 LDAP_LDBM_F (int) ldbm_errno( LDBM ldbm );
-LDAP_LDBM_F (LDBM) ldbm_open( char *name, int rw, int mode, int dbcachesize );
+LDAP_LDBM_F (LDBM) ldbm_open( DB_ENV *env, char *name, int rw, int mode, int dbcachesize );
 LDAP_LDBM_F (void) ldbm_close( LDBM ldbm );
 LDAP_LDBM_F (void) ldbm_sync( LDBM ldbm );
 LDAP_LDBM_F (void) ldbm_datum_free( LDBM ldbm, Datum data );