From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 25 Feb 2013 18:12:33 +0000 (-0500)
Subject: Fix windows build
X-Git-Tag: krb5-1.12-alpha1~282
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea5867f4c2283e0ef5ca51109010cfa26d6e5669;p=thirdparty%2Fkrb5.git

Fix windows build

Catch up to the split of preauth_plugin.h into client and
kdc specific portions.  While here, use copy's /y flag to suppress
an override-confirmation prompt (though we do not list any dependencies
for this target at the moment, so no such prompt will be generated).

Do not disable library finalizers for windows, erroneously disabled
in 4538146e1452e0966164119cefb0804993ce6bbb.
---

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index fffe768002..50023492fa 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -101,7 +101,7 @@ private-and-public-decls: $(HEADERS_TO_CHECK)
 	cat $(HEADERS_TO_CHECK) > $@
 ##DOS##!endif
 ##DOS##private-and-public-decls:
-##DOS##	copy krb5\krb5.h+k5-int.h+krb5\preauth_plugin.h $@
+##DOS##	copy /y krb5\krb5.h+k5-int.h+krb5\clpreauth_plugin.h $@
 
 #
 # Build the error table include files:
diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index f4021da71f..ad7888ab12 100644
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -347,7 +347,7 @@ typedef struct { int error; unsigned char did_run; } k5_init_t;
 
 
 
-#if !defined(SHARED)
+#if !defined(SHARED) && !defined(_WIN32)
 
 /*
  * In this case, we just don't care about finalization.