2009-11-26 Kai Tietz <kai.tietz@onevision.com>
* ntsecapi.h (STRING): Protect by guard.
(UNICODE_STRING): Likewise.
* ntsecapi.h: Likewise.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1561 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index d88ae45..dc9097c 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-26 Kai Tietz <kai.tietz@onevision.com>
+
+ * ntsecapi.h (STRING): Protect by guard.
+ (UNICODE_STRING): Likewise.
+ * ntsecapi.h: Likewise.
+
2009-11-21 Jonathan Yong <jon_y@sourceforge.net>
* shlobj.h (IDO_SHGIOI_DEFAULT): Define. Original patch by
diff --git a/mingw-w64-headers/include/ntsecapi.h b/mingw-w64-headers/include/ntsecapi.h
index 42599ec..b194182 100644
--- a/mingw-w64-headers/include/ntsecapi.h
+++ b/mingw-w64-headers/include/ntsecapi.h
@@ -563,9 +563,15 @@
} NEGOTIATE_CALLER_NAME_RESPONSE,*PNEGOTIATE_CALLER_NAME_RESPONSE;
#ifndef _NTDEF_
+#ifndef __UNICODE_STRING_DEFINED
+#define __UNICODE_STRING_DEFINED
typedef LSA_UNICODE_STRING UNICODE_STRING,*PUNICODE_STRING;
+#endif
+#ifndef __STRING_DEFINED
+#define __STRING_DEFINED
typedef LSA_STRING STRING,*PSTRING;
#endif
+#endif
#ifndef _DOMAIN_PASSWORD_INFORMATION_DEFINED
#define _DOMAIN_PASSWORD_INFORMATION_DEFINED
diff --git a/mingw-w64-headers/include/subauth.h b/mingw-w64-headers/include/subauth.h
index 217807b..8cf7520 100644
--- a/mingw-w64-headers/include/subauth.h
+++ b/mingw-w64-headers/include/subauth.h
@@ -13,18 +13,24 @@
#if (!defined(_NTDEF_)) && (!defined(_NTSECAPI_))
typedef LONG NTSTATUS,*PNTSTATUS;
+#ifndef __UNICODE_STRING_DEFINED
+#define __UNICODE_STRING_DEFINED
typedef struct _UNICODE_STRING {
USHORT Length;
USHORT MaximumLength;
PWSTR Buffer;
} UNICODE_STRING,*PUNICODE_STRING;
+#endif
+#ifndef __STRING_DEFINED
+#define __STRING_DEFINED
typedef struct _STRING {
USHORT Length;
USHORT MaximumLength;
PCHAR Buffer;
} STRING,*PSTRING;
#endif
+#endif
#ifndef _NTDEF_
