X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fportable.nt;h=6a62403cb7b55af423c5b761f74c143fe6f0ee30;hb=c1da50a4261747a5ea1f8f3843fcf33dc4f9496d;hp=9dea2a2c7c647ebe6e04e90c85e5c072def551d0;hpb=bb1b81473b29b30b81faf725fe3f14521d0c170f;p=openldap

diff --git a/include/portable.nt b/include/portable.nt
index 9dea2a2c7c..6a62403cb7 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
@@ -26,13 +26,20 @@
 /* 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 )
@@ -56,14 +63,8 @@
 /* define type for caddr_t */
 typedef char * caddr_t;
 
-#define ssize_t signed int
-
-/* 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
@@ -273,6 +274,9 @@ typedef char * caddr_t;
 /* define this to use SLAPD LDBM backend */
 #define SLAPD_LDBM 1
 
+/* define this to use SLAPD SQL backend */
+#define SLAPD_SQL 1
+
 /* define this to use SLAPD passwd backend */
 /* #undef SLAPD_PASSWD */
 
@@ -288,9 +292,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 */
 
@@ -438,7 +439,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 */