--- include/Attic/portable.nt	1999/09/10 20:25:23	1.3.2.1
+++ include/Attic/portable.nt	2000/06/13 17:57:15	1.3.2.2
@@ -1,8 +1,8 @@
-/* $OpenLDAP: pkg/ldap/include/portable.nt,v 1.3 1999/08/30 23:17:01 kdz Exp $ */
+/* $OpenLDAP: pkg/ldap/include/portable.nt,v 1.19 2000/06/06 17:43:18 kurt Exp $ */
 /* 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,24 +16,33 @@
 
 /* end of preamble */
 
+/* comment this out if you don't have Cyrus SASL */
+#define HAVE_CYRUS_SASL 1
+
 /* --------------------------------------------------- */
 /* begin of MSVC5 specific entries */
 
 #define OPENLDAP_PACKAGE "OpenLDAP"
 #define OPENLDAP_VERSION "-devel"
 #define EXEEXT ".exe"
-#define LDAP_DIRSEP "\\"
 
 /* don't suck in all of the win32 api */
 #define WIN32_LEAN_AND_MEAN
 
-#ifdef _WINNT
-/* WindowsNT specific features */
+#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
+#endif
+
+#ifdef HAVE_NT_THREADS
+/* enable WINNT specific features only if we have NT THREADS */
 #define HAVE_NT_SERVICE_MANAGER 1
 #define HAVE_NT_EVENT_LOG 1
-
-#elif _WIN95
-/* Windows95 specific features */
 #endif
 
 #if defined( _DEBUG ) && !defined( LDAP_DEBUG )
@@ -49,7 +58,6 @@
 
 #define strcasecmp	stricmp
 #define strncasecmp	strnicmp
-#define strdup		_strdup
 
 #define	snprintf	_snprintf
 #define vsnprintf	_vsnprintf
@@ -58,20 +66,8 @@
 /* define type for caddr_t */
 typedef char * caddr_t;
 
-#define ssize_t signed int
-
-#define LOG_DEBUG 0
-#define openlog( a, b )
-#define closelog()
-
-#define FD_SETSIZE 1024
-
-/* we have NT threads */
-#ifdef _MT
-#define HAVE_NT_THREADS 1
-#else
-#define NO_THREADS 1
-#endif
+/* define type for ssize_t */
+typedef signed int ssize_t;
 
 /* we have spawnlp instead of fork/execlp */
 #define HAVE_SPAWNLP 1
@@ -94,8 +90,8 @@ typedef char * caddr_t;
 /* we have <process.h> */
 #define HAVE_PROCESS_H 1
 
-#define LDAP_SIGUSR1	SIGILL
-#define LDAP_SIGUSR2	SIGTERM
+/* we have <wincrypt.h> */
+#define HAVE_WINCRYPT_H 1
 
 #define MAXPATHLEN _MAX_PATH
 
@@ -210,10 +206,7 @@ typedef char * caddr_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 */
@@ -266,9 +259,6 @@ typedef char * caddr_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
 
@@ -281,6 +271,9 @@ typedef char * caddr_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 */
 
@@ -296,9 +289,6 @@ typedef char * caddr_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 */
 
@@ -403,12 +393,12 @@ typedef char * caddr_t;
 /* Define if you have the sigset function.  */
 /* #undef HAVE_SIGSET */
 
-/* Define if you have the snprintf function.  */
-/* #undef HAVE_SNPRINTF */
-
 /* Define if you have the socket function.  */
 #define HAVE_SOCKET 1
 
+/* Define if you have the snprintf function.  */
+#define HAVE_SNPRINTF 1
+
 /* Define if you have the strdup function.  */
 #define HAVE_STRDUP 1
 
@@ -446,7 +436,7 @@ typedef char * caddr_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 */
@@ -527,7 +517,7 @@ typedef char * caddr_t;
 #define HAVE_MALLOC_H 1
 
 /* Define if you have the <memory.h> header file.  */
-/* #define HAVE_MEMORY_H */
+#define HAVE_MEMORY_H 1
 
 /* Define if you have the <ncurses.h> header file.  */
 /* #undef HAVE_NCURSES_H */