commit da0acca7d84fffaac85b6dd323b5bd6f86a3fe1f
author Francois Gouget <fgouget@codeweavers.com> Fri Nov 10 22:34:39 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Nov 10 22:34:39 2000 +0000
tree c2befeaedd4fc9e198d90062f070487bf9b11b6b
parent 6c97e4554689d50c455a56e00aa631828ca08435

Use DUMMYxxxNAME for anonymous struct/unions.

include/sqlext.h

diff --git a/include/sqlext.h b/include/sqlext.h
index 940dd81..c218d9a 100644
--- a/include/sqlext.h
+++ b/include/sqlext.h
@@ -1638,11 +1638,11 @@
 	union {
 		WCHAR	*wszArg;	
 		CHAR	*szArg;
-	}u1;
+	} DUMMYUNIONNAME1;
 	union {
 		WCHAR	*wszCorrelation;
 		CHAR	*szCorrelation;
-	}u2;				
+	} DUMMYUNIONNAME2;
 	RETCODE	RetCode;
 } ODBC_VS_ARGS, *PODBC_VS_ARGS;
 

include/winbase.h

diff --git a/include/winbase.h b/include/winbase.h
index da2e43a..fac2794 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -255,7 +255,7 @@
             LPVOID lpFirstBlock;
             LPVOID lpLastBlock;
         } Region;
-    } Foo;
+    } DUMMYUNIONNAME;
 } PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY;
 
 #define PROCESS_HEAP_REGION                   0x0001

include/winnt.h

diff --git a/include/winnt.h b/include/winnt.h
index b2009c4..5ed0b68 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -2196,17 +2196,17 @@
 		struct {
 			unsigned NameOffset:31;
 			unsigned NameIsString:1;
-		} s;
+		} DUMMYSTRUCTNAME1;
 		DWORD   Name;
 		WORD    Id;
-	} u1;
+	} DUMMYUNIONNAME1;
 	union {
 		DWORD   OffsetToData;
 		struct {
 			unsigned OffsetToDirectory:31;
 			unsigned DataIsDirectory:1;
-		} s;
-	} u2;
+		} DUMMYSTRUCTNAME2;
+	} DUMMYUNIONNAME2;
 } IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY;