From 7bb00a40eabbed2bc1c268f5244bfb9736d9bebe Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Tue, 4 Jan 2022 13:08:35 +1100
Subject: [PATCH] kdc: fix Windows build

---
 configure.ac   |  1 +
 kdc/NTMakefile |  3 ++-
 kdc/kdc.h      | 10 ----------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37a2275c2..1d5f84fd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -496,6 +496,7 @@ dnl export symbols
 rk_WIN32_EXPORT(BUILD_KRB5_LIB, KRB5_LIB)
 rk_WIN32_EXPORT(BUILD_ROKEN_LIB, ROKEN_LIB)
 rk_WIN32_EXPORT(BUILD_GSSAPI_LIB, GSSAPI_LIB)
+rk_WIN32_EXPORT(BUILD_KDC_LIB, KDC_LIB)
 
 dnl Checks for libraries.
 
diff --git a/kdc/NTMakefile b/kdc/NTMakefile
index 1d01e2a18..2dd65c721 100644
--- a/kdc/NTMakefile
+++ b/kdc/NTMakefile
@@ -154,7 +154,8 @@ libkdc_la_SOURCES = 		\
 	gss_preauth.c
 
 $(OBJ)\kdc-protos.h: $(libkdc_la_SOURCES)
-	$(PERL) ..\cf\make-proto.pl -q -P remove -o $@ $(libkdc_la_SOURCES) \
+	cd $(SRCDIR)
+	$(PERL) ..\cf\make-proto.pl -E KDC_LIB -q -P remove -o $@ $(libkdc_la_SOURCES) \
 	|| $(RM) $@
 
 $(OBJ)\kdc-private.h: $(libkdc_la_SOURCES)
diff --git a/kdc/kdc.h b/kdc/kdc.h
index 01922bb64..6d39e4c38 100644
--- a/kdc/kdc.h
+++ b/kdc/kdc.h
@@ -46,16 +46,6 @@
 #include <kx509_asn1.h>
 #include <gssapi/gssapi.h>
 
-#if !defined(BUILD_KDC_LIB) && defined(_WIN32)
-# define KDC_LIB_FUNCTION __declspec(dllimport)
-# define KDC_LIB_CALL     __stdcall
-# define KDC_LIB_VARIABLE __declspec(dllimport)
-#else
-# define KDC_LIB_FUNCTION
-# define KDC_LIB_CALL
-# define KDC_LIB_VARIABLE
-#endif
-
 #define heim_pcontext krb5_context
 #define heim_pconfig krb5_kdc_configuration *
 #include <heimbase-svc.h>