X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fportable.nt;h=8e478479da58fdb46718e6642a104b859d2938b6;hb=882b8c5f41747e5b5f8542c92119d866ad90d5f4;hp=e2769f98cdb3087edf3f81166b9ed99332a961fd;hpb=b7af076fee4d363bdfa963dfd458e13ea5e5816e;p=openldap

diff --git a/include/portable.nt b/include/portable.nt
index e2769f98cd..8e478479da 100644
--- a/include/portable.nt
+++ b/include/portable.nt
@@ -2,7 +2,7 @@
 /* include/portable.h.nt -- manually updated of MS NT (MS VC5) */
 /* synced with portable.h.in 1.24 */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -16,6 +16,9 @@
 
 /* end of preamble */
 
+/* comment this out if you don't have Cyrus SASL */
+#define HAVE_CYRUS_SASL 1
+
 /* --------------------------------------------------- */
 /* begin of MSVC5 specific entries */
 
@@ -26,7 +29,11 @@
 /* don't suck in all of the win32 api */
 #define WIN32_LEAN_AND_MEAN
 
-#ifdef _MT
+#if defined(_WIN32) && !defined(_WINNT) && !defined(_WIN95)
+#define _WINNT
+#endif
+
+#if defined( _MT ) && defined( _WINNT )
 #define HAVE_NT_THREADS 1
 #else
 #define NO_THREADS 1
@@ -199,10 +206,7 @@ typedef signed int ssize_t;
 #define HAVE_SYS_ERRLIST 1 
 
 /* define if you have berkeley db */
-/* #undef HAVE_BERKELEY_DB */
-
-/* define if you have berkeley db2 */
-#define HAVE_BERKELEY_DB2 1
+#define HAVE_BERKELEY_DB 1
 
 /* define if you have crypt */
 /* #undef HAVE_CRYPT */
@@ -255,9 +259,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
 
@@ -270,6 +271,9 @@ typedef signed int ssize_t;
 /* define this to use SLAPD LDBM backend */
 #define SLAPD_LDBM 1
 
+/* define this to use SLAPD SQL backend */
+/* #undef SLAPD_SQL */
+
 /* define this to use SLAPD passwd backend */
 /* #undef SLAPD_PASSWD */
 
@@ -285,9 +289,6 @@ typedef signed int ssize_t;
 /* define this for per-object ACIs */
 /* #undef SLAPD_ACI_ENABLED */
 
-/* define this for discrete rights in ACIs */
-/* #undef SLAPD_ACI_DISCRETE_RIGHTS */
-
 /* define this to use SLAPD shell backend */
 /* #undef SLAPD_SHELL */
 
@@ -435,7 +436,7 @@ typedef signed int ssize_t;
 /* #undef HAVE_SYSCONF */
 
 /* Define if you have the tempnam function.  */
-/* #undef HAVE_TEMPNAM */
+#define HAVE_TEMPNAM 1
 
 /* Define if you have the thr_getconcurrency function.  */
 /* #undef HAVE_THR_GETCONCURRENCY */
@@ -724,9 +725,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