Changes from HEAD for beta

[openldap] / servers / slapd / back-bdb / back-bdb.h

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 64bc55c547728097a5e3b47ca048978d7636c3eb..93356b13b5860fc95ee2880f55ace0fa515e6abe 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -14,9 +14,7 @@
 
 LDAP_BEGIN_DECL
 
-#ifdef LDAP_SYNCREPL
 #define BDB_SUBENTRIES 1
-#endif
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
@@ -158,9 +156,7 @@ struct bdb_info {
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
        LDAP_LIST_HEAD(pl, slap_op) bi_psearch_list;
-#endif
 #ifdef SLAP_IDL_CACHE
        int             bi_idl_cache_max_size;
        int             bi_idl_cache_size;
@@ -223,6 +219,10 @@ struct bdb_op_info {
 
 #define BDB_REUSE_LOCKERS
 
+#define BDB_CSN_COMMIT 0
+#define BDB_CSN_ABORT  1
+#define BDB_CSN_RETRY  2
+
 LDAP_END_DECL
 
 #include "proto-bdb.h"