Fixes for NT support:

  Remove macros already in Windows headers: strdup, FD_SETSIZE
  Set HAVE_SNPRINTF and HAVE_MEMORY_H to reflect NT environment
  Moved LDAP_DIRSEP macro to ldap_config.h.in
  Moved LDAP_SIGUSR macros to ac/signal.h

diff --git a/include/portable.nt b/include/portable.nt
index e358c26848c63eca8273dd6b93429ef1d65deb19..acec2d393a07f13bc364d6cd33101ac162a3d10f 100644 (file)
--- a/include/portable.nt
+++ b/include/portable.nt
@@ -22,7 +22,6 @@
 #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
@@ -49,7 +48,6 @@
 
 #define strcasecmp     stricmp
 #define strncasecmp    strnicmp
-#define strdup         _strdup
 
 #define        snprintf        _snprintf
 #define vsnprintf      _vsnprintf
@@ -64,8 +62,6 @@ typedef char * caddr_t;
 #define openlog( a, b )
 #define closelog()
 
-#define FD_SETSIZE 1024
-
 /* we have NT threads */
 #ifdef _MT
 #define HAVE_NT_THREADS 1
@@ -97,9 +93,6 @@ typedef char * caddr_t;
 /* we have <wincrypt.h> */
 #define HAVE_WINCRYPT_H 1
 
-#define LDAP_SIGUSR1   SIGILL
-#define LDAP_SIGUSR2   SIGTERM
-
 #define MAXPATHLEN _MAX_PATH
 
 /* end of MSVC5 specific entries */
@@ -406,12 +399,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
 
@@ -530,7 +523,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 */