commit 1972a5ea6b0805efe9bc48e7b6d209ffc5032ad7
author Kai Tietz <ktietz70@googlemail.com> Fri Feb 11 14:17:15 2011 +0000
committer Kai Tietz <ktietz70@googlemail.com> Fri Feb 11 14:17:15 2011 +0000
tree 184a5f708a695121e6d56de0d37f0d405faf2aa0
parent 9605cb4cd7644ff4ac6f3b1a087abc7b64109646

Reduce __C89_NAMELESS(UNION|STRUCT) to __C89_NAMELESS


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

mingw-w64-headers/include/winioctl.h

diff --git a/mingw-w64-headers/include/winioctl.h b/mingw-w64-headers/include/winioctl.h
index 0a885ff..1e7a670 100644
--- a/mingw-w64-headers/include/winioctl.h
+++ b/mingw-w64-headers/include/winioctl.h
@@ -594,7 +594,7 @@
 
 typedef struct _SET_PARTITION_INFORMATION_EX {
   PARTITION_STYLE PartitionStyle;
-  __C89_NAMELESSUNION union {
+  __C89_NAMELESS union {
     SET_PARTITION_INFORMATION_MBR Mbr;
     SET_PARTITION_INFORMATION_GPT Gpt;
   } DUMMYUNIONNAME;
@@ -611,7 +611,7 @@
 
 typedef struct _CREATE_DISK {
   PARTITION_STYLE PartitionStyle;
-  __C89_NAMELESSUNION union {
+  __C89_NAMELESS union {
     CREATE_DISK_MBR Mbr;
     CREATE_DISK_GPT Gpt;
   } DUMMYUNIONNAME;
@@ -627,7 +627,7 @@
   LARGE_INTEGER PartitionLength;
   DWORD PartitionNumber;
   BOOLEAN RewritePartition;
-  __C89_NAMELESSUNION union {
+  __C89_NAMELESS union {
     PARTITION_INFORMATION_MBR Mbr;
     PARTITION_INFORMATION_GPT Gpt;
   } DUMMYUNIONNAME;
@@ -647,7 +647,7 @@
 typedef struct _DRIVE_LAYOUT_INFORMATION_EX {
   DWORD PartitionStyle;
   DWORD PartitionCount;
-  __C89_NAMELESSUNION union {
+  __C89_NAMELESS union {
     DRIVE_LAYOUT_INFORMATION_MBR Mbr;
     DRIVE_LAYOUT_INFORMATION_GPT Gpt;
   } DUMMYUNIONNAME;
@@ -680,8 +680,8 @@
 typedef struct _DISK_DETECTION_INFO {
   DWORD SizeOfDetectInfo;
   DETECTION_TYPE DetectionType;
-  __C89_NAMELESSUNION union {
-    __C89_NAMELESSSTRUCT struct {
+  __C89_NAMELESS union {
+    __C89_NAMELESS struct {
       DISK_INT13_INFO Int13;
       DISK_EX_INT13_INFO ExInt13;
     } DUMMYSTRUCTNAME;
@@ -691,7 +691,7 @@
 typedef struct _DISK_PARTITION_INFO {
   DWORD SizeOfPartitionInfo;
   PARTITION_STYLE PartitionStyle;
-  __C89_NAMELESSUNION union {
+  __C89_NAMELESS union {
     struct {
       DWORD Signature;
       DWORD CheckSum;
@@ -728,7 +728,7 @@
   DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority;
   WORD DisablePrefetchTransferLength;
   BOOLEAN PrefetchScalar;
-  __C89_NAMELESSUNION union {
+  __C89_NAMELESS union {
     struct {
       WORD Minimum;
       WORD Maximum;
@@ -1638,8 +1638,8 @@
 
 typedef struct _FILE_OBJECTID_BUFFER {
   BYTE ObjectId[16];
-  __C89_NAMELESSUNION union {
-    __C89_NAMELESSSTRUCT struct {
+  __C89_NAMELESS union {
+    __C89_NAMELESS struct {
       BYTE BirthVolumeId[16];
       BYTE BirthObjectId[16];
       BYTE DomainId[16];
@@ -2079,7 +2079,7 @@
 } TXFS_LIST_TRANSACTIONS, *PTXFS_LIST_TRANSACTIONS;
 
 typedef struct _TXFS_READ_BACKUP_INFORMATION_OUT {
-  __C89_NAMELESSUNION union {
+  __C89_NAMELESS union {
     ULONG BufferLength;
     UCHAR Buffer;
   } DUMMYUNIONNAME;