merged with autoconf branch

[openldap] / servers / slapd / back-ldbm / id2entry.c

diff --git a/servers/slapd/back-ldbm/id2entry.c b/servers/slapd/back-ldbm/id2entry.c
index cbec89b050f5810f0a904fb01d6429cb88f94dde..b2f0aebf8d7228ce34ace36139673e7aaea64e32 100644 (file)
--- a/servers/slapd/back-ldbm/id2entry.c
+++ b/servers/slapd/back-ldbm/id2entry.c
@@ -1,8 +1,11 @@
 /* id2entry.c - routines to deal with the id2entry index */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/socket.h>
+
 #include "slap.h"
 #include "back-ldbm.h"
 
@@ -21,7 +24,7 @@ id2entry_add( Backend *be, Entry *e )
        Datum           key, data;
        int             len, rc, flags;
 
-#ifdef LDBM_USE_DB2
+#ifdef HAVE_BERKELEY_DB2
        memset( &key, 0, sizeof( key ) );
        memset( &data, 0, sizeof( data ) );
 #endif
@@ -73,7 +76,7 @@ id2entry_delete( Backend *be, Entry *e )
        /* XXX - check for writer lock - should also check no reader pending */
        assert(pthread_rdwr_wchk_np(&e->e_rdwr));
 
-#ifdef LDBM_USE_DB2
+#ifdef HAVE_BERKELEY_DB2
        memset( &key, 0, sizeof( key ) );
 #endif
 
@@ -114,7 +117,7 @@ id2entry( Backend *be, ID id, int rw )
        Datum           key, data;
        Entry           *e;
 
-#ifdef LDBM_USE_DB2
+#ifdef HAVE_BERKELEY_DB2
        memset( &key, 0, sizeof( key ) );
        memset( &data, 0, sizeof( data ) );
 #endif