Cleanup Windows build

Fix make depend errors in slapi

diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in
index 0e46f786412f74508588c4e6471e9ac6f816c235..da6fc046198e252b6a3b4944ac1bbf20a3b1c618 100644 (file)
--- a/servers/slapd/slapi/Makefile.in
+++ b/servers/slapd/slapi/Makefile.in
@@ -19,7 +19,7 @@ LIBRARY = libslapi.la
 #all-common: $(LIBRARY) $(PROGRAMS)
 #      @touch plugin.c slapi_pblock.c slapi_utils.c slapi_ops.c slapi_ext.c
 
-NT_SRCS = nt_err.c
+NT_SRCS = $(top_srcdir)/libraries/liblber/nt_err.c
 NT_OBJS = nt_err.lo
 
 LIB_DEFS = -DSLAPI_LIBRARY

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 37a67dd5a27dc7a0736882c5e92d5c7772f71132..94b777c38de1e0f91339d3e301a00bba1a1f424b 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -31,7 +31,11 @@
 #include <slap.h>
 #include <slapi.h>
 
+#ifdef _WIN32
+#include <winsock.h>
+#else
 #include <netdb.h>
+#endif
 
 #ifdef LDAP_SLAPI
 
@@ -1971,6 +1975,8 @@ slapi_timer_current_time( void )
         */
 #else /* _WIN32 */
        LARGE_INTEGER now;
+       static LARGE_INTEGER base_time, performance_freq;
+       static int performance_counter_present;
 
        if ( first_time ) {
                first_time = 0;