Define NONAMELESS{STRUCT,UNION} explicitly in the files that need them.

dlls/comctl32/comctl32undoc.c

@@ -37,6 +37,8 @@
 #include <ctype.h>
 #include <limits.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "commctrl.h"
 #include "objbase.h"
 #include "winbase.h"

dlls/comctl32/propsheet.c

@@ -25,6 +25,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "commctrl.h"
 #include "prsht.h"

dlls/comctl32/treeview.c

@@ -47,6 +47,8 @@
 #include <limits.h>
 #include <stdlib.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "wingdi.h"
 #include "commctrl.h"

dlls/commdlg/filedlg95.c

@@ -59,6 +59,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winternl.h"
 #include "winnls.h"

dlls/commdlg/filedlgbrowser.c

@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/commdlg/printdlg.c

@@ -24,6 +24,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/d3d8/device.c

@@ -19,6 +19,9 @@
  */
 
 #include <math.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/directx.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ddraw/d3dcommon.c

@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "objbase.h"
 #include "ddraw.h"

dlls/ddraw/d3ddevice/mesa.c

@@ -23,6 +23,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winerror.h"
 #include "objbase.h"

dlls/ddraw/d3dexecutebuffer.c

@@ -22,6 +22,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winerror.h"
 #include "objbase.h"

dlls/ddraw/d3dlight.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "config.h"
 #include "windef.h"
 #include "winerror.h"

dlls/ddraw/d3dmaterial.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "config.h"
 #include "windef.h"
 #include "winerror.h"

dlls/ddraw/d3dtexture.c

@@ -22,6 +22,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winerror.h"
 #include "objbase.h"

dlls/ddraw/d3dviewport.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "config.h"
 #include "windef.h"
 #include "winerror.h"

dlls/ddraw/ddraw/main.c

@@ -31,6 +31,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "ddraw.h"
 #include "d3d.h"

dlls/ddraw/ddraw/user.c

@@ -18,12 +18,13 @@
  */
 
 #include "config.h"
-#include "wine/debug.h"
-#include "ddraw.h"
 
 #include <assert.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "ddraw.h"
 #include "ddraw_private.h"
 #include "ddraw/main.h"
 #include "ddraw/user.h"
@@ -32,6 +33,7 @@
 #include "dsurface/main.h"
 #include "dsurface/dib.h"
 #include "dsurface/user.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

dlls/ddraw/direct3d/mesa.c

@@ -27,6 +27,8 @@
 #include <string.h>
 #include <stdio.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "d3d.h"
 #include "ddraw.h"
 #include "winerror.h"

dlls/ddraw/dsurface/dib.c

@@ -24,6 +24,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "bitmap.h"
 #include "wine/debug.h"

dlls/ddraw/dsurface/fakezbuffer.c

@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "ddraw.h"
 #include "d3d.h"
 

dlls/ddraw/dsurface/hal.c

@@ -22,6 +22,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wine/debug.h"
 #include "ddraw_private.h"
 #include "ddraw/user.h"

dlls/ddraw/dsurface/main.c

@@ -19,11 +19,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "config.h"
-#include "winerror.h"
 
 #include <assert.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "winerror.h"
 #include "mesa_private.h"
 #include "wine/debug.h"
 #include "ddraw_private.h"

dlls/ddraw/helper.c

@@ -26,6 +26,8 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "d3d.h"
 #include "ddraw.h"
 #include "winerror.h"

dlls/dplayx/dplay.c

@@ -24,6 +24,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winerror.h"
 #include "winbase.h"

dlls/dplayx/dplayx_global.c

@@ -24,6 +24,9 @@
  */
 
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wine/debug.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/dplayx/dplobby.c

@@ -20,6 +20,8 @@
  */
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winerror.h"
 #include "winreg.h"

dlls/dplayx/name_server.c

@@ -22,6 +22,9 @@
 /* NOTE: Methods with the NS_ prefix are name server methods */
 
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winnls.h"
 #include "wine/unicode.h"

dlls/dsound/sound3d.c

@@ -49,6 +49,8 @@
 #include <string.h>
 #include <math.h>	/* Insomnia - pow() function */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/kernel/time.c

@@ -31,6 +31,9 @@
 #ifdef HAVE_SYS_TIMES_H
 # include <sys/times.h>
 #endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "file.h"
 #include "winternl.h"
 #include "winerror.h"

dlls/ntdll/cdrom.c

@@ -61,6 +61,8 @@
 # include <sys/cdio.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winternl.h"
 #include "winioctl.h"
 #include "ntddstor.h"

dlls/ntdll/file.c

@@ -29,6 +29,9 @@
 #ifdef HAVE_SYS_ERRNO_H
 #include <sys/errno.h>
 #endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "wine/server.h"

dlls/ntdll/heap.c

@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "winbase.h"

dlls/ntdll/time.c

@@ -34,6 +34,9 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"

dlls/ntdll/virtual.c

@@ -38,6 +38,8 @@
 #include <sys/mman.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winternl.h"
 #include "global.h"
 #include "wine/library.h"

dlls/ole32/antimoniker.c

@@ -20,6 +20,9 @@
 
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/unicode.h"

dlls/ole32/clipboard.c

@@ -61,6 +61,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/ole32/compobj.c

@@ -29,6 +29,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "objbase.h"
 #include "ole2.h"

dlls/ole32/compositemoniker.c

@@ -20,6 +20,9 @@
 
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/debug.h"

dlls/ole32/datacache.c

@@ -45,6 +45,9 @@
  */
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/ole32/filemoniker.c

@@ -20,6 +20,9 @@
 
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"

dlls/ole32/hglobalstream.c

@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "objbase.h"
 #include "ole2.h"

dlls/ole32/itemmoniker.c

@@ -20,6 +20,9 @@
 
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/ole32/memlockbytes.c

@@ -24,6 +24,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "wine/winbase16.h"
 #include "objbase.h"

dlls/ole32/ole2.c

@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "commctrl.h"
 #include "ole2.h"
 #include "ole2ver.h"

dlls/ole32/ole2impl.c

@@ -19,6 +19,9 @@
  */
 
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"

dlls/ole32/ole2stubs.c

@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/oleproxy.c

@@ -37,6 +37,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "objbase.h"
 #include "ole2.h"

dlls/ole32/rpc.c

@@ -25,6 +25,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "objbase.h"
 #include "ole2.h"

dlls/ole32/stg_bigblockfile.c

@@ -37,6 +37,8 @@
 #include <string.h>
 #include <limits.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winerror.h"
 #include "objbase.h"

dlls/ole32/stg_stream.c

@@ -22,11 +22,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winerror.h"
 #include "winternl.h"

dlls/ole32/storage.c

@@ -30,6 +30,9 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winternl.h"
 #include "winerror.h"

dlls/ole32/storage32.c

@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h" /* for lstrlenW() and the likes */
 #include "winnls.h"
 #include "wine/unicode.h"

dlls/oleaut32/olefont.c

@@ -22,6 +22,9 @@
  */
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/oleaut32/olepicture.c

@@ -42,6 +42,9 @@
 #endif
 #include <stdio.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/oleaut32/tmarshal.c

@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winnls.h"
 #include "winreg.h"

dlls/oleaut32/typelib.c

@@ -60,6 +60,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winnls.h"         /* for PRIMARYLANGID */
 #include "winreg.h"         /* for HKEY_LOCAL_MACHINE */

dlls/oleaut32/variant.c

@@ -46,6 +46,8 @@
 # include <float.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "oleauto.h"
 #include "heap.h"

dlls/rpcrt4/ndr_ole.c

@@ -27,6 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/shell32/brsfolder.c

@@ -24,6 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wine/debug.h"
 #include "undocshell.h"
 #include "shlguid.h"

dlls/shell32/dataobject.c

@@ -21,6 +21,8 @@
  */
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "pidl.h"
 #include "winerror.h"
 #include "shell32_main.h"

dlls/shell32/shellstring.c

@@ -21,6 +21,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winnls.h"
 #include "winerror.h"
 #include "winreg.h"

dlls/shell32/shfldr_desktop.c

@@ -27,6 +27,8 @@
 #include <string.h>
 #include <stdio.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/shfldr_fs.c

@@ -27,6 +27,8 @@
 #include <string.h>
 #include <stdio.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/shfldr_mycomp.c

@@ -27,6 +27,8 @@
 #include <string.h>
 #include <stdio.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/shv_bg_cmenu.c

@@ -20,6 +20,8 @@
  */
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wine/debug.h"
 
 #include "pidl.h"

dlls/shell32/shv_item_cmenu.c

@@ -20,6 +20,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "wine/debug.h"
 

dlls/shlwapi/istream.c

@@ -19,6 +19,8 @@
  */
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"

dlls/shlwapi/string.c

@@ -29,6 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/twain/dsm_ctrl.c

@@ -21,6 +21,9 @@
 #include "config.h"
 
 #include <stdlib.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "twain.h"
 #include "twain_i.h"

dlls/urlmon/umon.c

@@ -26,6 +26,8 @@
 #define COM_NO_WINDOWS_H
 #include <stdio.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/user/exticon.c

@@ -31,6 +31,8 @@
 # include <unistd.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "windef.h"
 #include "winerror.h"

dlls/version/resource.c

@@ -29,6 +29,8 @@
 # include <unistd.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "lzexpand.h"
 

dlls/winedos/int2f.c

@@ -24,9 +24,11 @@
 #include "config.h"
 
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wine/winbase16.h"
 #include "miscemu.h"
-/* #define DEBUG_INT */
 #include "wine/debug.h"
 #include "winioctl.h"
 #include "ntddstor.h"

dlls/winedos/vga.c

@@ -19,6 +19,9 @@
  */
 
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"

dlls/wineps/driver.c

@@ -23,6 +23,9 @@
  */
 
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "psdrv.h"
 #include "wine/debug.h"
 #include "winuser.h"

dlls/wineps/init.c

@@ -27,6 +27,8 @@
 # include <unistd.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "gdi.h"
 #include "psdrv.h"
 #include "wine/debug.h"

dlls/wineps/ps.c

@@ -21,6 +21,9 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "gdi.h"
 #include "psdrv.h"
 #include "winspool.h"

dlls/winmm/mmsystem.c

@@ -32,6 +32,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "mmsystem.h"
 #include "winbase.h"
 

dlls/winmm/wineoss/mixer.c

@@ -36,6 +36,8 @@
 # include <sys/ioctl.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "mmddk.h"
 #include "oss.h"

dlls/winmm/winmm.c

@@ -30,6 +30,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "mmsystem.h"
 #include "winbase.h"
 #include "wine/winuser16.h" /* FIXME: should be removed, only used for UserYield16 */

dlls/winspool/info.c

@@ -24,7 +24,6 @@
 
 #include "config.h"
 #include "wine/port.h"
-#include "wine/library.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,6 +36,10 @@
 #  define CUPS_SONAME "libcups.so"
 # endif
 #endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "wine/library.h"
 #include "winspool.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/x11drv/dga2.c

@@ -22,6 +22,8 @@
 
 #ifdef HAVE_LIBXXF86DGA2
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "ts_xlib.h"
 #include <X11/extensions/xf86dga.h>
 

dlls/x11drv/keyboard.c

@@ -38,6 +38,8 @@
 #include <ctype.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"

dlls/x11drv/mouse.c

@@ -25,6 +25,8 @@
 #include <X11/extensions/xf86dga.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "wine/winuser16.h"
 

dlls/x11drv/x11ddraw.c

@@ -22,6 +22,8 @@
 
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "ts_xlib.h"
 #include "x11drv.h"
 #include "x11ddraw.h"

files/drive.c

@@ -54,6 +54,8 @@
 # endif
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winternl.h"
 #include "wine/winbase16.h"   /* for GetCurrentTask */

files/file.c

@@ -55,6 +55,8 @@
 # include <utime.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

include/winnt.h

@@ -136,19 +136,27 @@
 
 /* Anonymous union/struct handling */
 
-#ifdef __WINESRC__
+#ifndef NONAMELESSSTRUCT
-# define NONAMELESSSTRUCT
+# ifdef __GNUC__
-# define NONAMELESSUNION
+   /* Anonymous struct support starts with gcc 2.96 or gcc/g++ 3.x */
-#else
+#  if (__GNUC__ < 2) || ((__GNUC__ == 2) && (defined(__cplusplus) || (__GNUC_MINOR__ < 96)))
-/* Anonymous struct support starts with gcc 2.96 or gcc/g++ 3.x */
+#   define NONAMELESSSTRUCT
-# if !defined(NONAMELESSSTRUCT) && (defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && (defined(__cplusplus) || (__GNUC_MINOR__ < 96))))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#  endif
+# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 #  define NONAMELESSSTRUCT
 # endif
-/* Anonymous unions support starts with gcc 2.96/g++ 2.95 */
+#endif  /* NONAMELESSSTRUCT */
-# if !defined(NONAMELESSUNION) && (defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ < 95) || ((__GNUC_MINOR__ == 95) && !defined(__cplusplus)))))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+
+#ifndef NONAMELESSUNION
+# ifdef __GNUC__
+   /* Anonymous unions support starts with gcc 2.96/g++ 2.95 */
+#  if (__GNUC__ < 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ < 95) || ((__GNUC_MINOR__ == 95) && !defined(__cplusplus))))
+#   define NONAMELESSUNION
+#  endif
+# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 #  define NONAMELESSUNION
 # endif
-#endif
+#endif  /* NONAMELESSUNION */
 
 #ifndef NONAMELESSSTRUCT
 #define DUMMYSTRUCTNAME

library/loader.c

@@ -30,6 +30,8 @@
 #include <sys/mman.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "wine/library.h"
 

loader/pe_resource.c

@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "wine/unicode.h"
 #include "windef.h"
 #include "winnls.h"

memory/heap.c

@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "winerror.h"

memory/virtual.c

@@ -29,6 +29,8 @@
 # include <unistd.h>
 #endif
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winnls.h"
 #include "winbase.h"
 #include "winternl.h"

misc/cpu.c

@@ -26,6 +26,8 @@
 #include <string.h>
 #include <stdio.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"

misc/system.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winbase16.h"

msdos/vxd.c

@@ -28,6 +28,9 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "windef.h"
 #include "winternl.h"

scheduler/timer.c

@@ -23,6 +23,9 @@
 
 #include <assert.h>
 #include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winerror.h"
 #include "winnls.h"
 #include "wine/unicode.h"

tools/winedump/pe.c

@@ -38,6 +38,8 @@
 #endif
 #include <fcntl.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winedump.h"
 #include "pe.h"

win32/newfns.c

@@ -32,6 +32,9 @@ at a later date. */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

windows/input.c

@@ -28,6 +28,8 @@
 #include <ctype.h>
 #include <assert.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winnls.h"
 #include "winbase.h"