Misc DESC updates

[openldap] / include / portable.nt

diff --git a/include/portable.nt b/include/portable.nt
index 208edae1044ef4e1b85d0cb763b3f35b652824e4..8d0cca998c5185c44d53973c80dd3817180b4355 100644 (file)
--- a/include/portable.nt
+++ b/include/portable.nt
@@ -16,10 +16,10 @@
 
 /* end of preamble */
 
-#if !defined( SLAPD_SCHEMA_COMPAT ) && !defined( SLAPD_SCHEMA_NOT_COMPAT )
-       /* use new schema codes */
-#define SLAPD_SCHEMA_NOT_COMPAT 1
-#endif
+/* comment this out if you don't have Cyrus SASL */
+#define HAVE_CYRUS_SASL 1
+
+// #define SLAPD_BDB 1
 
 /* --------------------------------------------------- */
 /* begin of MSVC5 specific entries */
@@ -261,9 +261,6 @@ typedef signed int ssize_t;
 /* define this for ACL Group support */
 #define SLAPD_ACLGROUPS 1
 
-/* define this to use SLAPD Berkeley DB2 backend */
-/* #define SLAPD_BDB2 1 */
-
 /* define this for ClearText password support */
 #define SLAPD_CLEARTEXT 1
 
@@ -277,7 +274,7 @@ typedef signed int ssize_t;
 #define SLAPD_LDBM 1
 
 /* define this to use SLAPD SQL backend */
-#define SLAPD_SQL 1
+/* #undef SLAPD_SQL */
 
 /* define this to use SLAPD passwd backend */
 /* #undef SLAPD_PASSWD */
@@ -730,9 +727,9 @@ typedef signed int ssize_t;
 
 /* begin of postamble */
 
-#ifndef __NEED_PROTOTYPES
+#ifndef LDAP_NEEDS_PROTOTYPES
 /* force LDAP_P to always include prototypes */
-#define __NEED_PROTOTYPES 1 
+#define LDAP_NEEDS_PROTOTYPES 1 
 #endif
 
 #ifdef HAVE_STDDEF_H
@@ -746,6 +743,10 @@ typedef signed int ssize_t;
 #define LDAP_DEBUG
 #endif
 
+#ifndef OLD_LOGGING
+// #  define NEW_LOGGING 1
+#endif
+
 #include "ldap_cdefs.h"
 #include "ldap_features.h"