Wrap O_DSYNC in MDB_DSYNC.

[openldap] / libraries / libmdb / midl.h

diff --git a/libraries/libmdb/midl.h b/libraries/libmdb/midl.h
index aeb0af6203199b0cdf5f1f131b6060c89b2219d1..0836760ab53faaa762ae804abae5d9e5924a82ca 100644 (file)
--- a/libraries/libmdb/midl.h
+++ b/libraries/libmdb/midl.h
@@ -17,10 +17,8 @@
 #ifndef _MDB_MIDL_H_
 #define _MDB_MIDL_H_
 
-#define AC_MEMCPY(dst,src,size)        memcpy(dst,src,size)
-
 #define        ID      unsigned long
-#define        NOID    ((ID)~0)
+#define        NOID    (~(ID)0)
 
 /* IDL sizes - likely should be even bigger
  *   limiting factors: sizeof(ID), thread stack size
@@ -61,18 +59,26 @@
 #define MDB_IDL_IS_ALL( range, ids ) ( (ids)[0] == NOID \
        && (ids)[1] <= (range)[1] && (range)[2] <= (ids)[2] )
 
-#define MDB_IDL_CPY( dst, src ) (AC_MEMCPY( dst, src, MDB_IDL_SIZEOF( src ) ))
+#define MDB_IDL_CPY( dst, src ) (memcpy( dst, src, MDB_IDL_SIZEOF( src ) ))
 
 #define MDB_IDL_ID( bdb, ids, id ) MDB_IDL_RANGE( ids, id, ((bdb)->bi_lastid) )
 #define MDB_IDL_ALL( bdb, ids ) MDB_IDL_RANGE( ids, 1, ((bdb)->bi_lastid) )
 
-#define MDB_IDL_FIRST( ids )   ( ids[1] )
+#define MDB_IDL_FIRST( ids )   ( (ids)[1] )
 #define MDB_IDL_LAST( ids )            ( MDB_IDL_IS_RANGE(ids) \
-       ? ids[2] : ids[ids[0]] )
+       ? (ids)[2] : (ids)[(ids)[0]] )
 
 #define MDB_IDL_N( ids )               ( MDB_IDL_IS_RANGE(ids) \
-       ? (ids[2]-ids[1])+1 : ids[0] )
+       ? ((ids)[2]-(ids)[1])+1 : (ids)[0] )
 
 int mdb_midl_insert( ID *ids, ID id );
 
+typedef struct MIDL2 {
+       ID mid;
+       void *mptr;
+} MIDL2;
+
+unsigned mdb_midl2_search( MIDL2 *ids, MIDL2 *id );
+int mdb_midl2_insert( MIDL2 *ids, MIDL2 *id );
+
 #endif /* _MDB_MIDL_H_ */