krb5 commit: Fix macro redefinition warnings in cc_mslsa.c

Sam Hartman hartmans at MIT.EDU
Mon Jul 16 09:33:14 EDT 2012


https://github.com/krb5/krb5/commit/ee6fbe222b34b28c617d4e6df994700af471b1b6
commit ee6fbe222b34b28c617d4e6df994700af471b1b6
Author: Kevin Wasserman <kevin.wasserman at 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 at 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


More information about the cvs-krb5 mailing list