ITS#5658 hppa fixes

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

diff --git a/servers/slapd/back-bdb/idl.h b/servers/slapd/back-bdb/idl.h
index bf302679b4b06e22da915fdf8b9f90f92c5185a1..593dc9875d1674703b93f2f96ee9e0e46daa1d0a 100644 (file)
--- a/servers/slapd/back-bdb/idl.h
+++ b/servers/slapd/back-bdb/idl.h
@@ -1,35 +1,33 @@
-/* back-bdb.h - ldap ldbm back-end header file */
+/* idl.h - ldap bdb back-end ID list header file */
 /* $OpenLDAP$ */
-/*
- * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2009 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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 in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _BDB_IDL_H_
 #define _BDB_IDL_H_
 
-#include <portable.h>
-
-#include "slap.h"
-
 /* IDL sizes - likely should be even bigger
  *   limiting factors: sizeof(ID), thread stack size
- *
- * Note: the -2 stuff is intended to reduce the size
- * just enough to avoiding internal (to malloc) allocation
- * of overly large blocks to provide the requested size. 
- * The stuff needs to be thought out better, doesn't deal
- * well with mixed stack/malloc allocation of IDLs.
  */
-#define BDB_IDL_DB_SIZE                ((1<<16)-2) /* 32K IDL on disk */
-#define BDB_IDL_UM_SIZE                ((1<<17)-2) /* 64K IDL in memory */
+#define        BDB_IDL_LOGN    16      /* DB_SIZE is 2^16, UM_SIZE is 2^17 */
+#define BDB_IDL_DB_SIZE                (1<<BDB_IDL_LOGN)
+#define BDB_IDL_UM_SIZE                (1<<(BDB_IDL_LOGN+1))
 #define BDB_IDL_UM_SIZEOF      (BDB_IDL_UM_SIZE * sizeof(ID))
 
-#define BDB_IDL_DB_MAX         (BDB_IDL_DB_SIZE-2)
-/* #define BDB_IDL_DB_ALLOC    (BDB_IDL_DB_SIZE * sizeof(ID)) */
+#define BDB_IDL_DB_MAX         (BDB_IDL_DB_SIZE-1)
 
-#define BDB_IDL_UM_MAX                 (BDB_IDL_UM_SIZE-2)
-/* #define BDB_IDL_UM_ALLOC    (BDB_IDL_UM_SIZE * sizeof(ID)) */
+#define BDB_IDL_UM_MAX         (BDB_IDL_UM_SIZE-1)
 
 #define BDB_IDL_IS_RANGE(ids)  ((ids)[0] == NOID)
 #define BDB_IDL_RANGE_SIZE             (3)