Remove discrete right macro (not used)

[openldap] / include / portable.nt

diff --git a/include/portable.nt b/include/portable.nt
index 8e515f34a210df811abc88d9de8b41508020cff9..cb21918247a74002bc3ffd9452c756060b58a128 100644 (file)
--- a/include/portable.nt
+++ b/include/portable.nt
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /* include/portable.h.nt -- manually updated of MS NT (MS VC5) */
 /* synced with portable.h.in 1.24 */
 /*
@@ -21,18 +22,20 @@
 #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 */
+#ifdef _MT
+#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 )
@@ -48,7 +51,6 @@
 
 #define strcasecmp     stricmp
 #define strncasecmp    strnicmp
-#define strdup         _strdup
 
 #define        snprintf        _snprintf
 #define vsnprintf      _vsnprintf
@@ -57,20 +59,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
@@ -93,8 +83,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
 
@@ -280,6 +270,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 */
 
@@ -295,9 +288,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 */
 
@@ -402,12 +392,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
 
@@ -445,7 +435,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 */
@@ -526,7 +516,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 */
@@ -734,9 +724,9 @@ typedef char * caddr_t;
 
 /* begin of postamble */
 
-#ifndef __NEEDS_PROTOTYPES
+#ifndef __NEED_PROTOTYPES
 /* force LDAP_P to always include prototypes */
-#define __NEEDS_PROTOTYPES 1 
+#define __NEED_PROTOTYPES 1 
 #endif
 
 #ifdef HAVE_STDDEF_H