Merge branch 'mdb.master' into vl32

[openldap] / libraries / liblmdb / midl.h

diff --git a/libraries/liblmdb/midl.h b/libraries/liblmdb/midl.h
index f2bb4338decc7f4e832dacf54166dbda110771b7..f23d7d3f3eae56faa14228212f00a5917ca9f206 100644 (file)
--- a/libraries/liblmdb/midl.h
+++ b/libraries/liblmdb/midl.h
@@ -1,5 +1,5 @@
 /**    @file midl.h
- *     @brief mdb ID List header file.
+ *     @brief LMDB ID List header file.
  *
  *     This file was originally part of back-bdb but has been
  *     modified for use in libmdb. Most of the macros defined
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-/** @defgroup internal MDB Internals
+/** @defgroup internal LMDB Internals
  *     @{
  */
 
@@ -55,7 +55,11 @@ typedef MDB_ID *MDB_IDL;
 /* IDL sizes - likely should be even bigger
  *   limiting factors: sizeof(ID), thread stack size
  */
+#ifdef VL32
+#define        MDB_IDL_LOGN    10      /* DB_SIZE is 2^10, UM_SIZE is 2^11 */
+#else
 #define        MDB_IDL_LOGN    16      /* DB_SIZE is 2^16, UM_SIZE is 2^17 */
+#endif
 #define MDB_IDL_DB_SIZE                (1<<MDB_IDL_LOGN)
 #define MDB_IDL_UM_SIZE                (1<<(MDB_IDL_LOGN+1))
 
@@ -68,6 +72,9 @@ typedef MDB_ID *MDB_IDL;
 #define MDB_IDL_FIRST( ids )   ( (ids)[1] )
 #define MDB_IDL_LAST( ids )            ( (ids)[(ids)[0]] )
 
+       /** Current max length of an #mdb_midl_alloc()ed IDL */
+#define MDB_IDL_ALLOCLEN( ids )        ( (ids)[-1] )
+
        /** Append ID to IDL. The IDL must be big enough. */
 #define mdb_midl_xappend(idl, id) do { \
                MDB_ID *xidl = (idl), xlen = ++(xidl[0]); \
@@ -128,6 +135,12 @@ int mdb_midl_append_list( MDB_IDL *idp, MDB_IDL app );
         */
 int mdb_midl_append_range( MDB_IDL *idp, MDB_ID id, unsigned n );
 
+       /** Merge an IDL onto an IDL. The destination IDL must be big enough.
+        * @param[in] idl       The IDL to merge into.
+        * @param[in] merge     The IDL to merge.
+        */
+void mdb_midl_xmerge( MDB_IDL idl, MDB_IDL merge );
+
        /** Sort an IDL.
         * @param[in,out] ids   The IDL to sort.
         */