From 3489931553a684ab388b29dde0b8b2cf6cf63e79 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 7 Sep 2023 20:03:07 +0100 Subject: [PATCH] Cleanup Windows build Fix make depend errors in slapi --- servers/slapd/slapi/Makefile.in | 2 +- servers/slapd/slapi/slapi_utils.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in index 0e46f78641..da6fc04619 100644 --- 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 37a67dd5a2..94b777c38d 100644 --- a/servers/slapd/slapi/slapi_utils.c +++ b/servers/slapd/slapi/slapi_utils.c @@ -31,7 +31,11 @@ #include #include +#ifdef _WIN32 +#include +#else #include +#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;