From dc4b5caedcd9f461900b9dfe53c1d7c59aa4cd82 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 15 Jul 2008 09:43:48 +0000
Subject: [PATCH] * cyglsa.c: Include ntddk.h again, but only if
__MINGW32__ is defined. * cyglsa64.dll: Regenerate. *
make-64bit-version-with-visual-c.bat: Fix comment.
---
winsup/lsaauth/ChangeLog | 6 ++++++
winsup/lsaauth/cyglsa.c | 3 +++
winsup/lsaauth/cyglsa64.dll | Bin 8704 -> 8704 bytes
.../make-64bit-version-with-visual-c.bat | 4 ++--
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog
index c73c956a4..962bd6e11 100644
--- a/winsup/lsaauth/ChangeLog
+++ b/winsup/lsaauth/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-15 Corinna Vinschen <corinna@vinschen.de>
+
+ * cyglsa.c: Include ntddk.h again, but only if __MINGW32__ is defined.
+ * cyglsa64.dll: Regenerate.
+ * make-64bit-version-with-visual-c.bat: Fix comment.
+
2008-07-13 Corinna Vinschen <corinna@vinschen.de>
* cyglsa.c: Don't include ntddk.h.
diff --git a/winsup/lsaauth/cyglsa.c b/winsup/lsaauth/cyglsa.c
index 582e226e9..1ec0f7d63 100644
--- a/winsup/lsaauth/cyglsa.c
+++ b/winsup/lsaauth/cyglsa.c
@@ -19,6 +19,9 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */
#include <lm.h>
#include <iptypes.h>
#include <ntsecapi.h>
+#ifdef __MINGW32__
+#include <ntddk.h>
+#endif
#include "../cygwin/cyglsa.h"
#include "../cygwin/include/cygwin/version.h"
diff --git a/winsup/lsaauth/cyglsa64.dll b/winsup/lsaauth/cyglsa64.dll
index 2f7c9a8bbc2177e7f59791a805af970f7a834a0e..ef5c7aabf33ba381c6726615836eedb7e27c4e3d 100644
GIT binary patch
delta 91
zcmZp0X>ghFfO&Ur&Bn*(;`WtH?x`hVsYS(^`FRWs&l!O{pTy!4*P^2QA_j&k5Z^gJ
qx1h8nwa70qH#MArVKz&6QD#Z1TV_rw!|}<H64@ZLHXoO;<OBdN*CB-f
delta 91
zcmZp0X>ghFfH~)X<;KV6;`Sv>?x`hVsYS(^`FRWs&lrI`pTy!4*P^2QA_j&^5Z^gJ
qx1h8nwa70qH#MArVIoU-QD#Z1TV_rw!=cHM64@ZLHXoO;<OBdgjUn#<
diff --git a/winsup/lsaauth/make-64bit-version-with-visual-c.bat b/winsup/lsaauth/make-64bit-version-with-visual-c.bat
index 95741dcce..cd623038e 100644
--- a/winsup/lsaauth/make-64bit-version-with-visual-c.bat
+++ b/winsup/lsaauth/make-64bit-version-with-visual-c.bat
@@ -6,8 +6,8 @@ rem Note that you need not only the SDK headers and libs, but also the
rem 64 bit ntdll.lib file from a DDK supporting 64 bit builds.
rem
rem Make sure all necessary include paths are set in %Include% (inc\ddk,
-rem inc\atl, inc\crt) and rem that %Lib% points to the 64 bit libs, not
-rem the 32 bit libs. In the latter case the link stage will succeed,
+rem inc\atl, inc\crt) and make sure that %Lib% points to the 64 bit libs, not
+rem to the 32 bit libs. In the latter case the link stage will succeed,
rem but the resulting DLL is non-functional.
rem
rem This can be used as long as no x86_64-pe/coff capable gcc is available.