commit 88784198f52b646eeb52ac42d3d8a5372cfddfff
author Kai Tietz <ktietz70@googlemail.com> Wed Jan 12 18:28:01 2011 +0000
committer Kai Tietz <ktietz70@googlemail.com> Wed Jan 12 18:28:01 2011 +0000
tree e255eb59c9490350e59d09cc7ea96e05169a1e5c
parent 2980c378983c4564b8eca6eed1612619853de33d

Fix another conflicting type-definitions.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3953 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ntdef.h

diff --git a/mingw-w64-headers/include/ntdef.h b/mingw-w64-headers/include/ntdef.h
index 42e6600..2e58d18 100644
--- a/mingw-w64-headers/include/ntdef.h
+++ b/mingw-w64-headers/include/ntdef.h
@@ -427,12 +427,16 @@
 #define NT_ERROR(Status)                ((((ULONG)(Status)) >> 30) == 3)
 
 /* String Types */
+#ifndef __UNICODE_STRING_DEFINED
+#define __UNICODE_STRING_DEFINED
 typedef struct _UNICODE_STRING {
   USHORT Length;
   USHORT MaximumLength;
   PWSTR  Buffer;
 } UNICODE_STRING, *PUNICODE_STRING;
+#endif
 typedef const UNICODE_STRING* PCUNICODE_STRING;
+
 #define UNICODE_NULL ((WCHAR)0)
 
 typedef struct _CSTRING {
@@ -442,11 +446,14 @@
 } CSTRING, *PCSTRING;
 #define ANSI_NULL ((CHAR)0)
 
+#ifndef __STRING_DEFINED
+#define __STRING_DEFINED
 typedef struct _STRING {
   USHORT Length;
   USHORT MaximumLength;
   PCHAR  Buffer;
 } STRING, *PSTRING;
+#endif
 
 typedef STRING ANSI_STRING;
 typedef PSTRING PANSI_STRING;