commit 3095e5af76f957d48e05d22fd5ba1b63474cb801
author Alexandre Julliard <julliard@winehq.org> Mon Sep 12 10:54:51 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 12 10:54:51 2005 +0000
tree 36e610d70b47fe70a3860a5425ff31d3ff6d8b86
parent d3dba4e56cc64199ea366c382f42c7ef9aaf8767

Fixed the binary layout gcc hacks to do the right thing for gcc 4.0.

include/shlobj.h

diff --git a/include/shlobj.h b/include/shlobj.h
index 16e6227..22356c5 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -606,7 +606,7 @@
     BOOL fShowSuperHidden : 1;
     BOOL fNoNetCrawling : 1;
 
-    DWORD :0; /* Required for proper binary layout with gcc */
+    UINT :15; /* Required for proper binary layout with gcc */
     DWORD dwWin95Unused;
     UINT  uWin95Unused;
     LONG   lParamSort;
@@ -617,7 +617,7 @@
     BOOL fStartPanelOn: 1;
     BOOL fShowStartPage: 1;
     UINT fSpareFlags : 13;
-    UINT :0; /* Required for proper binary layout with gcc */
+    UINT :15; /* Required for proper binary layout with gcc */
 } SHELLSTATE, *LPSHELLSTATE;
 
 /**********************************************************************
@@ -641,7 +641,7 @@
 
 	BOOL fHideIcons : 1;
 	UINT fRestFlags : 3;
-	UINT :0; /* Required for proper binary layout with gcc */
+	UINT :15; /* Required for proper binary layout with gcc */
 } SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
 
 VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
@@ -1156,7 +1156,7 @@
     BOOL fDontPrettyNames:1;
     BOOL fAdminsCreateCommonGroups:1;
     UINT fUnusedFlags:7;
-    UINT :0; /* Required for proper binary layout with gcc */
+    UINT :15; /* Required for proper binary layout with gcc */
     UINT fMenuEnumFilter;
 } CABINETSTATE, *LPCABINETSTATE;