[26733] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix macro redefinition warnings in cc_mslsa.c
daemon@ATHENA.MIT.EDU (Sam Hartman)
Mon Jul 16 09:34:00 2012
Date: Mon, 16 Jul 2012 09:33:14 -0400
From: Sam Hartman <hartmans@mit.edu>
Message-Id: <201207161333.q6GDXEvt012860@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/ee6fbe222b34b28c617d4e6df994700af471b1b6
commit ee6fbe222b34b28c617d4e6df994700af471b1b6
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Fri Jul 13 10:20:10 2012 -0400
Fix macro redefinition warnings in cc_mslsa.c
Include ntstatus.h and define WIN32_NO_STATUS before including winnt.h
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7213
src/lib/krb5/ccache/cc_mslsa.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index 9c4ec50..e1a2f70 100644
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -53,6 +53,8 @@
#define UNICODE
#define _UNICODE
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
#include "k5-int.h"
#include "com_err.h"
#include "cc-int.h"
@@ -70,7 +72,6 @@
#endif
#define _WIN32_WINNT 0x0600
#include <ntsecapi.h>
-#include <ntstatus.h>
/* The following two features can only be built using the version of the
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
