NT port

diff --git a/include/ac/syslog.h b/include/ac/syslog.h
index 0b2262429cf39e8a609052679812d33478a9df59..ebc143b9f0ff1d50f1008ff4b0be5617033ba50a 100644 (file)
--- a/include/ac/syslog.h
+++ b/include/ac/syslog.h
@@ -25,8 +25,10 @@
 #      define OPENLOG_OPTIONS ( LOG_PID | LOG_NDELAY )
 #elif defined( LOG_NOWAIT )
 #      define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT )
-#else
+#elif defined( LOG_PID )
 #      define OPENLOG_OPTIONS ( LOG_PID )
+#else
+#   define OPENLOG_OPTIONS ( 0 )
 #endif
 
 #endif /* _AC_SYSLOG_H_ */

diff --git a/include/ac/time.h b/include/ac/time.h
index 8bdf4c5d02ea0e43add0c6da27a537df089a7aa1..3da6ddfe07728777941cfc3835b08f04d87abceb 100644 (file)
--- a/include/ac/time.h
+++ b/include/ac/time.h
@@ -21,4 +21,9 @@
 # include <time.h>
 #endif
 
+#ifdef WIN32
+#include <sys/types.h>
+#include <sys/timeb.h>
+#endif
+
 #endif /* _AC_TIME_H */

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 8761eb38cf7d089aea2640ea6172c0763ea8bb13..335adb794558dd8bbc0b67820b51038c23a78867 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -65,7 +65,7 @@ extern int    ldap_syslog_level;
                        syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \
        }
 #else /* LDAP_SYSLOG */
-#ifndef WINSOCK
+#ifndef HAVE_WINSOCK
 #define Debug( level, fmt, arg1, arg2, arg3 ) \
                if ( ldap_debug & (level) ) \
                        fprintf( stderr, (fmt), (arg1), (arg2), (arg3) );

diff --git a/include/lutil.h b/include/lutil.h
index dfe1d9d9adf92916b9d38a976bb49efe1caa0a7b..be87d7168f8213b3cde48911e48705483eaa3a0f 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -20,8 +20,8 @@ LDAP_BEGIN_DECL
 
 /* ISC Base64 Routines */
 /* base64.c */
-LDAP_F int lutil_b64_ntop LDAP_P((u_char const *, size_t, char *, size_t));
-LDAP_F int lutil_b64_pton LDAP_P((char const *, u_char *, size_t));
+LDAP_F int lutil_b64_ntop LDAP_P((unsigned char const *, size_t, char *, size_t));
+LDAP_F int lutil_b64_pton LDAP_P((char const *, unsigned char *, size_t));
 /* detach.c */
 LDAP_F void lutil_detach LDAP_P((int debug, int do_close));
 /* passwd.c */

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index cdcabf4e415c6cbfcd68696a94d4158f92b7f6a3..da40db8fb67452e3ce203dfbde9939d112c944a4 100644 (file)
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -43,7 +43,7 @@ LDAP_F void lutil_SHA1Init
        LDAP_P((lutil_SHA1_CTX *context));
 
 LDAP_F void lutil_SHA1Update
-       LDAP_P((lutil_SHA1_CTX *context, const unsigned char *data, u_int len));
+       LDAP_P((lutil_SHA1_CTX *context, const unsigned char *data, uint32 len));
 
 LDAP_F void lutil_SHA1Final
        LDAP_P((unsigned char digest[20], lutil_SHA1_CTX *context));

diff --git a/include/portable.h.nt b/include/portable.h.nt
index 0420ab3995da97f7d9b20e7ce9cf405c1576d86e..7b6aac408f05ac4990012ac575a12116d00f7987 100644 (file)
--- a/include/portable.h.nt
+++ b/include/portable.h.nt
@@ -36,6 +36,9 @@
 /* define type for caddr_t */
 typedef char * caddr_t;
 
+#define LOG_DEBUG 0
+#define openlog( a, b )
+
 /* we have NT threads */
 #define HAVE_NT_THREADS 1
 
@@ -230,7 +233,7 @@ typedef char * caddr_t;
 #define SLAPD_ACLGROUPS 1
 
 /* define this to use SLAPD Berkeley DB2 backend */
-#define SLAPD_BDB2 1 
+/* #define SLAPD_BDB2 1 */
 
 /* define this for ClearText password support */
 #define SLAPD_CLEARTEXT 1
@@ -239,7 +242,7 @@ typedef char * caddr_t;
 /* #undef SLAPD_CRYPT */
 
 /* define this to use SLAPD LDBM backend */
-/* #define SLAPD_LDBM 1 */
+#define SLAPD_LDBM 1
 
 /* define this to use SLAPD passwd backend */
 /* #undef SLAPD_PASSWD */