I don't know why I did it. By the end, I just wanted to
kill someone. My machine build Wine in about 1h, and I
had to do it by hand, with a edit/compile/error/... Ehhh!!!
Oh well, here it is. Alexandre, if you can apply this one
quickly I'd appreciate it, it touches the tree in so many
spots it makes it hard for me to work, and extract patches.
ChangeLog
Define NONAMELESS{STRUCT,UNION} explicitly in the files that need them.
Index: dlls/comctl32/comctl32undoc.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/comctl32undoc.c,v
retrieving revision 1.75
diff -u -r1.75 comctl32undoc.c
--- dlls/comctl32/comctl32undoc.c 16 Dec 2002 22:43:58 -0000 1.75
+++ dlls/comctl32/comctl32undoc.c 6 Jan 2003 05:11:56 -0000
@@ -37,6 +37,8 @@
#include <ctype.h>
#include <limits.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "commctrl.h"
#include "objbase.h"
#include "winbase.h"
Index: dlls/comctl32/propsheet.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/propsheet.c,v
retrieving revision 1.78
diff -u -r1.78 propsheet.c
--- dlls/comctl32/propsheet.c 3 Jan 2003 03:06:42 -0000 1.78
+++ dlls/comctl32/propsheet.c 6 Jan 2003 05:13:51 -0000
@@ -25,6 +25,8 @@
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "commctrl.h"
#include "prsht.h"
Index: dlls/comctl32/treeview.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/treeview.c,v
retrieving revision 1.111
diff -u -r1.111 treeview.c
--- dlls/comctl32/treeview.c 16 Dec 2002 22:43:58 -0000 1.111
+++ dlls/comctl32/treeview.c 6 Jan 2003 05:16:39 -0000
@@ -47,6 +47,8 @@
#include <limits.h>
#include <stdlib.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "wingdi.h"
#include "commctrl.h"
Index: dlls/commdlg/filedlg95.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/filedlg95.c,v
retrieving revision 1.87
diff -u -r1.87 filedlg95.c
--- dlls/commdlg/filedlg95.c 2 Jan 2003 19:25:44 -0000 1.87
+++ dlls/commdlg/filedlg95.c 6 Jan 2003 04:08:11 -0000
@@ -59,6 +59,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winternl.h"
#include "winnls.h"
Index: dlls/commdlg/filedlgbrowser.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/filedlgbrowser.c,v
retrieving revision 1.37
diff -u -r1.37 filedlgbrowser.c
--- dlls/commdlg/filedlgbrowser.c 25 Oct 2002 03:50:14 -0000 1.37
+++ dlls/commdlg/filedlgbrowser.c 6 Jan 2003 04:08:50 -0000
@@ -22,6 +22,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
Index: dlls/commdlg/printdlg.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/printdlg.c,v
retrieving revision 1.59
diff -u -r1.59 printdlg.c
--- dlls/commdlg/printdlg.c 21 Nov 2002 23:55:10 -0000 1.59
+++ dlls/commdlg/printdlg.c 6 Jan 2003 04:10:02 -0000
@@ -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"
Index: dlls/d3d8/device.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/device.c,v
retrieving revision 1.20
diff -u -r1.20 device.c
--- dlls/d3d8/device.c 3 Jan 2003 21:28:05 -0000 1.20
+++ dlls/d3d8/device.c 6 Jan 2003 03:19:07 -0000
@@ -19,6 +19,9 @@
*/
#include <math.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
Index: dlls/d3d8/directx.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/directx.c,v
retrieving revision 1.10
diff -u -r1.10 directx.c
--- dlls/d3d8/directx.c 2 Jan 2003 17:59:02 -0000 1.10
+++ dlls/d3d8/directx.c 6 Jan 2003 03:22:00 -0000
@@ -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"
Index: dlls/ddraw/d3dcommon.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/d3dcommon.c,v
retrieving revision 1.12
diff -u -r1.12 d3dcommon.c
--- dlls/ddraw/d3dcommon.c 3 Jan 2003 21:07:22 -0000 1.12
+++ dlls/ddraw/d3dcommon.c 6 Jan 2003 03:24:36 -0000
@@ -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"
Index: dlls/ddraw/d3dexecutebuffer.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/d3dexecutebuffer.c,v
retrieving revision 1.21
diff -u -r1.21 d3dexecutebuffer.c
--- dlls/ddraw/d3dexecutebuffer.c 5 Jan 2003 20:28:35 -0000 1.21
+++ dlls/ddraw/d3dexecutebuffer.c 6 Jan 2003 03:25:57 -0000
@@ -22,6 +22,8 @@
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winerror.h"
#include "objbase.h"
Index: dlls/ddraw/d3dlight.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/d3dlight.c,v
retrieving revision 1.11
diff -u -r1.11 d3dlight.c
--- dlls/ddraw/d3dlight.c 3 Jan 2003 21:05:38 -0000 1.11
+++ dlls/ddraw/d3dlight.c 6 Jan 2003 03:26:40 -0000
@@ -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"
Index: dlls/ddraw/d3dmaterial.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/d3dmaterial.c,v
retrieving revision 1.13
diff -u -r1.13 d3dmaterial.c
--- dlls/ddraw/d3dmaterial.c 3 Jan 2003 21:05:38 -0000 1.13
+++ dlls/ddraw/d3dmaterial.c 6 Jan 2003 03:27:22 -0000
@@ -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"
Index: dlls/ddraw/d3dtexture.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/d3dtexture.c,v
retrieving revision 1.40
diff -u -r1.40 d3dtexture.c
--- dlls/ddraw/d3dtexture.c 5 Jan 2003 01:04:55 -0000 1.40
+++ dlls/ddraw/d3dtexture.c 6 Jan 2003 03:28:18 -0000
@@ -18,10 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "config.h"
#include "windef.h"
#include "winerror.h"
#include "objbase.h"
Index: dlls/ddraw/d3dviewport.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/d3dviewport.c,v
retrieving revision 1.16
diff -u -r1.16 d3dviewport.c
--- dlls/ddraw/d3dviewport.c 2 Jan 2003 20:02:49 -0000 1.16
+++ dlls/ddraw/d3dviewport.c 6 Jan 2003 03:28:58 -0000
@@ -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"
Index: dlls/ddraw/helper.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/helper.c,v
retrieving revision 1.25
diff -u -r1.25 helper.c
--- dlls/ddraw/helper.c 2 Jan 2003 19:45:23 -0000 1.25
+++ dlls/ddraw/helper.c 6 Jan 2003 03:34:22 -0000
@@ -26,6 +26,8 @@
#include <stddef.h>
#include <stdio.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "d3d.h"
#include "ddraw.h"
#include "winerror.h"
Index: dlls/ddraw/d3ddevice/mesa.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/d3ddevice/mesa.c,v
retrieving revision 1.78
diff -u -r1.78 mesa.c
--- dlls/ddraw/d3ddevice/mesa.c 5 Jan 2003 20:28:35 -0000 1.78
+++ dlls/ddraw/d3ddevice/mesa.c 6 Jan 2003 03:25:17 -0000
@@ -23,6 +23,8 @@
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winerror.h"
#include "objbase.h"
Index: dlls/ddraw/ddraw/main.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/ddraw/main.c,v
retrieving revision 1.37
diff -u -r1.37 main.c
--- dlls/ddraw/ddraw/main.c 5 Jan 2003 20:28:17 -0000 1.37
+++ dlls/ddraw/ddraw/main.c 6 Jan 2003 03:30:19 -0000
@@ -31,6 +31,8 @@
#include <assert.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "ddraw.h"
#include "d3d.h"
Index: dlls/ddraw/ddraw/user.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/ddraw/user.c,v
retrieving revision 1.13
diff -u -r1.13 user.c
--- dlls/ddraw/ddraw/user.c 6 Nov 2002 19:53:45 -0000 1.13
+++ dlls/ddraw/ddraw/user.c 6 Jan 2003 03:31:19 -0000
@@ -17,13 +17,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/debug.h"
-#include "ddraw.h"
-
#include <assert.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "config.h"
+#include "ddraw.h"
#include "ddraw_private.h"
#include "ddraw/main.h"
#include "ddraw/user.h"
@@ -32,6 +32,7 @@
#include "dsurface/main.h"
#include "dsurface/dib.h"
#include "dsurface/user.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
Index: dlls/ddraw/direct3d/mesa.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/direct3d/mesa.c,v
retrieving revision 1.24
diff -u -r1.24 mesa.c
--- dlls/ddraw/direct3d/mesa.c 3 Jan 2003 19:10:48 -0000 1.24
+++ dlls/ddraw/direct3d/mesa.c 6 Jan 2003 03:29:38 -0000
@@ -27,6 +27,8 @@
#include <string.h>
#include <stdio.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "d3d.h"
#include "ddraw.h"
#include "winerror.h"
Index: dlls/ddraw/dsurface/dib.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/dsurface/dib.c,v
retrieving revision 1.24
diff -u -r1.24 dib.c
--- dlls/ddraw/dsurface/dib.c 2 Jan 2003 20:14:24 -0000 1.24
+++ dlls/ddraw/dsurface/dib.c 6 Jan 2003 03:31:58 -0000
@@ -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"
Index: dlls/ddraw/dsurface/fakezbuffer.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/dsurface/fakezbuffer.c,v
retrieving revision 1.6
diff -u -r1.6 fakezbuffer.c
--- dlls/ddraw/dsurface/fakezbuffer.c 2 Jan 2003 19:58:21 -0000 1.6
+++ dlls/ddraw/dsurface/fakezbuffer.c 6 Jan 2003 03:32:26 -0000
@@ -27,6 +27,8 @@
#include <stdlib.h>
#include <assert.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "ddraw.h"
#include "d3d.h"
Index: dlls/ddraw/dsurface/hal.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/dsurface/hal.c,v
retrieving revision 1.7
diff -u -r1.7 hal.c
--- dlls/ddraw/dsurface/hal.c 6 Nov 2002 19:53:45 -0000 1.7
+++ dlls/ddraw/dsurface/hal.c 6 Jan 2003 03:32:50 -0000
@@ -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"
Index: dlls/ddraw/dsurface/main.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/dsurface/main.c,v
retrieving revision 1.43
diff -u -r1.43 main.c
--- dlls/ddraw/dsurface/main.c 3 Jan 2003 21:16:03 -0000 1.43
+++ dlls/ddraw/dsurface/main.c 6 Jan 2003 03:33:19 -0000
@@ -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"
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.38
diff -u -r1.38 dplay.c
--- dlls/dplayx/dplay.c 23 Oct 2002 22:20:46 -0000 1.38
+++ dlls/dplayx/dplay.c 6 Jan 2003 05:18:19 -0000
@@ -24,6 +24,8 @@
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winerror.h"
#include "winbase.h"
Index: dlls/dplayx/dplayx_global.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplayx_global.c,v
retrieving revision 1.18
diff -u -r1.18 dplayx_global.c
--- dlls/dplayx/dplayx_global.c 23 Oct 2002 22:20:46 -0000 1.18
+++ dlls/dplayx/dplayx_global.c 6 Jan 2003 05:19:06 -0000
@@ -24,6 +24,9 @@
*/
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "wine/debug.h"
#include "winbase.h"
#include "winerror.h"
Index: dlls/dplayx/dplobby.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplobby.c,v
retrieving revision 1.23
diff -u -r1.23 dplobby.c
--- dlls/dplayx/dplobby.c 10 Dec 2002 22:56:46 -0000 1.23
+++ dlls/dplayx/dplobby.c 6 Jan 2003 05:19:47 -0000
@@ -20,6 +20,8 @@
*/
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winerror.h"
#include "winreg.h"
Index: dlls/dplayx/name_server.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/name_server.c,v
retrieving revision 1.12
diff -u -r1.12 name_server.c
--- dlls/dplayx/name_server.c 31 May 2002 23:25:46 -0000 1.12
+++ dlls/dplayx/name_server.c 6 Jan 2003 05:20:43 -0000
@@ -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"
Index: dlls/dsound/sound3d.c
===================================================================
RCS file: /var/cvs/wine/dlls/dsound/sound3d.c,v
retrieving revision 1.9
diff -u -r1.9 sound3d.c
--- dlls/dsound/sound3d.c 4 Jan 2003 01:24:59 -0000 1.9
+++ dlls/dsound/sound3d.c 6 Jan 2003 05:25:17 -0000
@@ -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"
Index: dlls/kernel/time.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/time.c,v
retrieving revision 1.29
diff -u -r1.29 time.c
--- dlls/kernel/time.c 19 Dec 2002 04:12:42 -0000 1.29
+++ dlls/kernel/time.c 6 Jan 2003 04:03:42 -0000
@@ -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"
Index: dlls/ntdll/cdrom.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.21
diff -u -r1.21 cdrom.c
--- dlls/ntdll/cdrom.c 12 Dec 2002 22:23:35 -0000 1.21
+++ dlls/ntdll/cdrom.c 6 Jan 2003 03:54:26 -0000
@@ -61,6 +61,8 @@
# include <sys/cdio.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winternl.h"
#include "winioctl.h"
#include "ntddstor.h"
Index: dlls/ntdll/file.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/file.c,v
retrieving revision 1.19
diff -u -r1.19 file.c
--- dlls/ntdll/file.c 5 Dec 2002 19:56:16 -0000 1.19
+++ dlls/ntdll/file.c 6 Jan 2003 03:54:53 -0000
@@ -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"
Index: dlls/ntdll/heap.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/heap.c,v
retrieving revision 1.13
diff -u -r1.13 heap.c
--- dlls/ntdll/heap.c 5 Dec 2002 19:56:16 -0000 1.13
+++ dlls/ntdll/heap.c 6 Jan 2003 03:55:13 -0000
@@ -26,6 +26,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winternl.h"
#include "wine/winbase16.h"
#include "winbase.h"
Index: dlls/ntdll/time.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/time.c,v
retrieving revision 1.26
diff -u -r1.26 time.c
--- dlls/ntdll/time.c 18 Dec 2002 02:31:34 -0000 1.26
+++ dlls/ntdll/time.c 6 Jan 2003 03:56:18 -0000
@@ -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"
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.3
diff -u -r1.3 virtual.c
--- dlls/ntdll/virtual.c 21 Nov 2002 03:45:03 -0000 1.3
+++ dlls/ntdll/virtual.c 6 Jan 2003 03:55:55 -0000
@@ -38,6 +38,8 @@
#include <sys/mman.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winternl.h"
#include "global.h"
#include "wine/library.h"
Index: dlls/ole32/antimoniker.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/antimoniker.c,v
retrieving revision 1.12
diff -u -r1.12 antimoniker.c
--- dlls/ole32/antimoniker.c 19 Dec 2002 01:09:40 -0000 1.12
+++ dlls/ole32/antimoniker.c 6 Jan 2003 04:10:42 -0000
@@ -20,6 +20,9 @@
#include <assert.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winerror.h"
#include "wine/unicode.h"
Index: dlls/ole32/clipboard.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/clipboard.c,v
retrieving revision 1.23
diff -u -r1.23 clipboard.c
--- dlls/ole32/clipboard.c 22 Nov 2002 04:43:02 -0000 1.23
+++ dlls/ole32/clipboard.c 6 Jan 2003 04:11:09 -0000
@@ -61,6 +61,8 @@
#include <assert.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
Index: dlls/ole32/compobj.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/compobj.c,v
retrieving revision 1.70
diff -u -r1.70 compobj.c
--- dlls/ole32/compobj.c 5 Dec 2002 20:33:08 -0000 1.70
+++ dlls/ole32/compobj.c 6 Jan 2003 04:11:34 -0000
@@ -29,6 +29,8 @@
#include <string.h>
#include <assert.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "objbase.h"
#include "ole2.h"
Index: dlls/ole32/compositemoniker.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/compositemoniker.c,v
retrieving revision 1.18
diff -u -r1.18 compositemoniker.c
--- dlls/ole32/compositemoniker.c 3 Jan 2003 19:12:56 -0000 1.18
+++ dlls/ole32/compositemoniker.c 6 Jan 2003 04:12:00 -0000
@@ -20,6 +20,9 @@
#include <assert.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
Index: dlls/ole32/datacache.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/datacache.c,v
retrieving revision 1.16
diff -u -r1.16 datacache.c
--- dlls/ole32/datacache.c 5 Dec 2002 20:33:08 -0000 1.16
+++ dlls/ole32/datacache.c 6 Jan 2003 04:12:25 -0000
@@ -45,6 +45,9 @@
*/
#include <assert.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
Index: dlls/ole32/filemoniker.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/filemoniker.c,v
retrieving revision 1.22
diff -u -r1.22 filemoniker.c
--- dlls/ole32/filemoniker.c 19 Dec 2002 01:09:40 -0000 1.22
+++ dlls/ole32/filemoniker.c 6 Jan 2003 04:12:52 -0000
@@ -20,6 +20,9 @@
#include <assert.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
Index: dlls/ole32/hglobalstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/hglobalstream.c,v
retrieving revision 1.14
diff -u -r1.14 hglobalstream.c
--- dlls/ole32/hglobalstream.c 12 Nov 2002 02:13:49 -0000 1.14
+++ dlls/ole32/hglobalstream.c 6 Jan 2003 04:13:17 -0000
@@ -28,6 +28,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "objbase.h"
#include "ole2.h"
Index: dlls/ole32/itemmoniker.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/itemmoniker.c,v
retrieving revision 1.16
diff -u -r1.16 itemmoniker.c
--- dlls/ole32/itemmoniker.c 19 Dec 2002 01:09:40 -0000 1.16
+++ dlls/ole32/itemmoniker.c 6 Jan 2003 04:13:42 -0000
@@ -20,6 +20,9 @@
#include <assert.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winbase.h"
#include "winnls.h"
Index: dlls/ole32/memlockbytes.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/memlockbytes.c,v
retrieving revision 1.9
diff -u -r1.9 memlockbytes.c
--- dlls/ole32/memlockbytes.c 5 Jan 2003 01:04:34 -0000 1.9
+++ dlls/ole32/memlockbytes.c 6 Jan 2003 04:14:11 -0000
@@ -24,6 +24,8 @@
#include <assert.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "wine/winbase16.h"
#include "objbase.h"
Index: dlls/ole32/ole2.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole2.c,v
retrieving revision 1.38
diff -u -r1.38 ole2.c
--- dlls/ole32/ole2.c 18 Dec 2002 20:48:06 -0000 1.38
+++ dlls/ole32/ole2.c 6 Jan 2003 04:14:42 -0000
@@ -28,6 +28,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "commctrl.h"
#include "ole2.h"
#include "ole2ver.h"
Index: dlls/ole32/ole2impl.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole2impl.c,v
retrieving revision 1.6
diff -u -r1.6 ole2impl.c
--- dlls/ole32/ole2impl.c 9 Mar 2002 23:39:09 -0000 1.6
+++ dlls/ole32/ole2impl.c 6 Jan 2003 04:18:39 -0000
@@ -19,6 +19,9 @@
*/
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
Index: dlls/ole32/ole2stubs.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole2stubs.c,v
retrieving revision 1.26
diff -u -r1.26 ole2stubs.c
--- dlls/ole32/ole2stubs.c 2 Dec 2002 18:10:58 -0000 1.26
+++ dlls/ole32/ole2stubs.c 6 Jan 2003 04:15:48 -0000
@@ -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"
Index: dlls/ole32/oleproxy.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/oleproxy.c,v
retrieving revision 1.5
diff -u -r1.5 oleproxy.c
--- dlls/ole32/oleproxy.c 19 Dec 2002 22:16:35 -0000 1.5
+++ dlls/ole32/oleproxy.c 6 Jan 2003 04:19:05 -0000
@@ -37,6 +37,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "objbase.h"
#include "ole2.h"
Index: dlls/ole32/rpc.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/rpc.c,v
retrieving revision 1.7
diff -u -r1.7 rpc.c
--- dlls/ole32/rpc.c 19 Dec 2002 22:16:35 -0000 1.7
+++ dlls/ole32/rpc.c 6 Jan 2003 04:19:35 -0000
@@ -25,6 +25,8 @@
#include <string.h>
#include <assert.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "objbase.h"
#include "ole2.h"
Index: dlls/ole32/stg_bigblockfile.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/stg_bigblockfile.c,v
retrieving revision 1.8
diff -u -r1.8 stg_bigblockfile.c
--- dlls/ole32/stg_bigblockfile.c 5 Dec 2002 20:33:08 -0000 1.8
+++ dlls/ole32/stg_bigblockfile.c 6 Jan 2003 04:19:58 -0000
@@ -37,6 +37,8 @@
#include <string.h>
#include <limits.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
Index: dlls/ole32/stg_stream.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/stg_stream.c,v
retrieving revision 1.15
diff -u -r1.15 stg_stream.c
--- dlls/ole32/stg_stream.c 12 Sep 2002 22:07:04 -0000 1.15
+++ dlls/ole32/stg_stream.c 6 Jan 2003 04:20:53 -0000
@@ -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"
Index: dlls/ole32/storage.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/storage.c,v
retrieving revision 1.29
diff -u -r1.29 storage.c
--- dlls/ole32/storage.c 5 Jan 2003 01:04:34 -0000 1.29
+++ dlls/ole32/storage.c 6 Jan 2003 04:21:21 -0000
@@ -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"
Index: dlls/ole32/storage32.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/storage32.c,v
retrieving revision 1.35
diff -u -r1.35 storage32.c
--- dlls/ole32/storage32.c 18 Nov 2002 19:43:58 -0000 1.35
+++ dlls/ole32/storage32.c 6 Jan 2003 04:21:51 -0000
@@ -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"
Index: dlls/oleaut32/olefont.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/olefont.c,v
retrieving revision 1.19
diff -u -r1.19 olefont.c
--- dlls/oleaut32/olefont.c 5 Dec 2002 20:33:08 -0000 1.19
+++ dlls/oleaut32/olefont.c 6 Jan 2003 04:37:26 -0000
@@ -22,6 +22,9 @@
*/
#include <assert.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winbase.h"
#include "wingdi.h"
Index: dlls/oleaut32/olepicture.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/olepicture.c,v
retrieving revision 1.21
diff -u -r1.21 olepicture.c
--- dlls/oleaut32/olepicture.c 2 Jan 2003 17:54:57 -0000 1.21
+++ dlls/oleaut32/olepicture.c 6 Jan 2003 04:37:52 -0000
@@ -42,6 +42,9 @@
#endif
#include <stdio.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winbase.h"
#include "wingdi.h"
Index: dlls/oleaut32/tmarshal.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/tmarshal.c,v
retrieving revision 1.13
diff -u -r1.13 tmarshal.c
--- dlls/oleaut32/tmarshal.c 12 Dec 2002 22:25:07 -0000 1.13
+++ dlls/oleaut32/tmarshal.c 6 Jan 2003 04:38:30 -0000
@@ -26,6 +26,8 @@
#include <stdio.h>
#include <ctype.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winnls.h"
#include "winreg.h"
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/typelib.c,v
retrieving revision 1.86
diff -u -r1.86 typelib.c
--- dlls/oleaut32/typelib.c 5 Jan 2003 20:32:30 -0000 1.86
+++ dlls/oleaut32/typelib.c 6 Jan 2003 04:38:56 -0000
@@ -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 */
Index: dlls/oleaut32/variant.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/variant.c,v
retrieving revision 1.52
diff -u -r1.52 variant.c
--- dlls/oleaut32/variant.c 5 Jan 2003 01:06:04 -0000 1.52
+++ dlls/oleaut32/variant.c 6 Jan 2003 04:39:33 -0000
@@ -46,6 +46,8 @@
# include <float.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "oleauto.h"
#include "heap.h"
Index: dlls/rpcrt4/ndr_ole.c
===================================================================
RCS file: /var/cvs/wine/dlls/rpcrt4/ndr_ole.c,v
retrieving revision 1.2
diff -u -r1.2 ndr_ole.c
--- dlls/rpcrt4/ndr_ole.c 5 Dec 2002 20:33:08 -0000 1.2
+++ dlls/rpcrt4/ndr_ole.c 6 Jan 2003 05:26:30 -0000
@@ -27,6 +27,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
Index: dlls/shell32/brsfolder.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/brsfolder.c,v
retrieving revision 1.43
diff -u -r1.43 brsfolder.c
--- dlls/shell32/brsfolder.c 13 Dec 2002 00:30:30 -0000 1.43
+++ dlls/shell32/brsfolder.c 6 Jan 2003 04:44:51 -0000
@@ -24,6 +24,8 @@
#include <stdlib.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "wine/debug.h"
#include "undocshell.h"
#include "shlguid.h"
Index: dlls/shell32/dataobject.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/dataobject.c,v
retrieving revision 1.35
diff -u -r1.35 dataobject.c
--- dlls/shell32/dataobject.c 18 Dec 2002 20:48:06 -0000 1.35
+++ dlls/shell32/dataobject.c 6 Jan 2003 04:47:20 -0000
@@ -21,6 +21,8 @@
*/
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "pidl.h"
#include "winerror.h"
#include "shell32_main.h"
Index: dlls/shell32/shellstring.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shellstring.c,v
retrieving revision 1.24
diff -u -r1.24 shellstring.c
--- dlls/shell32/shellstring.c 25 Oct 2002 03:50:14 -0000 1.24
+++ dlls/shell32/shellstring.c 6 Jan 2003 04:49:23 -0000
@@ -21,6 +21,8 @@
#include <ctype.h>
#include <stdlib.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winnls.h"
#include "winerror.h"
#include "winreg.h"
Index: dlls/shell32/shfldr_desktop.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_desktop.c,v
retrieving revision 1.7
diff -u -r1.7 shfldr_desktop.c
--- dlls/shell32/shfldr_desktop.c 16 Dec 2002 23:48:30 -0000 1.7
+++ dlls/shell32/shfldr_desktop.c 6 Jan 2003 04:54:09 -0000
@@ -27,6 +27,8 @@
#include <string.h>
#include <stdio.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winbase.h"
#include "winreg.h"
Index: dlls/shell32/shfldr_fs.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_fs.c,v
retrieving revision 1.6
diff -u -r1.6 shfldr_fs.c
--- dlls/shell32/shfldr_fs.c 19 Dec 2002 04:11:22 -0000 1.6
+++ dlls/shell32/shfldr_fs.c 6 Jan 2003 04:57:47 -0000
@@ -27,6 +27,8 @@
#include <string.h>
#include <stdio.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winbase.h"
#include "winreg.h"
Index: dlls/shell32/shfldr_mycomp.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_mycomp.c,v
retrieving revision 1.5
diff -u -r1.5 shfldr_mycomp.c
--- dlls/shell32/shfldr_mycomp.c 15 Dec 2002 01:14:04 -0000 1.5
+++ dlls/shell32/shfldr_mycomp.c 6 Jan 2003 04:59:15 -0000
@@ -27,6 +27,8 @@
#include <string.h>
#include <stdio.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winbase.h"
#include "winreg.h"
Index: dlls/shell32/shv_bg_cmenu.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shv_bg_cmenu.c,v
retrieving revision 1.23
diff -u -r1.23 shv_bg_cmenu.c
--- dlls/shell32/shv_bg_cmenu.c 5 Dec 2002 20:33:08 -0000 1.23
+++ dlls/shell32/shv_bg_cmenu.c 6 Jan 2003 05:02:24 -0000
@@ -20,6 +20,8 @@
*/
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "wine/debug.h"
#include "pidl.h"
Index: dlls/shell32/shv_item_cmenu.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shv_item_cmenu.c,v
retrieving revision 1.14
diff -u -r1.14 shv_item_cmenu.c
--- dlls/shell32/shv_item_cmenu.c 13 Dec 2002 00:36:52 -0000 1.14
+++ dlls/shell32/shv_item_cmenu.c 6 Jan 2003 05:00:58 -0000
@@ -20,6 +20,8 @@
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "wine/debug.h"
Index: dlls/shlwapi/istream.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/istream.c,v
retrieving revision 1.2
diff -u -r1.2 istream.c
--- dlls/shlwapi/istream.c 5 Dec 2002 20:33:07 -0000 1.2
+++ dlls/shlwapi/istream.c 6 Jan 2003 05:32:13 -0000
@@ -19,6 +19,8 @@
*/
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
Index: dlls/shlwapi/string.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/string.c,v
retrieving revision 1.29
diff -u -r1.29 string.c
--- dlls/shlwapi/string.c 3 Jan 2003 19:12:56 -0000 1.29
+++ dlls/shlwapi/string.c 6 Jan 2003 05:32:37 -0000
@@ -29,6 +29,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "windef.h"
#include "winbase.h"
Index: dlls/twain/dsm_ctrl.c
===================================================================
RCS file: /var/cvs/wine/dlls/twain/dsm_ctrl.c,v
retrieving revision 1.4
diff -u -r1.4 dsm_ctrl.c
--- dlls/twain/dsm_ctrl.c 6 Sep 2002 19:41:18 -0000 1.4
+++ dlls/twain/dsm_ctrl.c 6 Jan 2003 05:32:51 -0000
@@ -21,6 +21,9 @@
#include "config.h"
#include <stdlib.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "twain.h"
#include "twain_i.h"
Index: dlls/urlmon/umon.c
===================================================================
RCS file: /var/cvs/wine/dlls/urlmon/umon.c,v
retrieving revision 1.18
diff -u -r1.18 umon.c
--- dlls/urlmon/umon.c 3 Jan 2003 19:12:55 -0000 1.18
+++ dlls/urlmon/umon.c 6 Jan 2003 05:33:03 -0000
@@ -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"
Index: dlls/user/exticon.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/exticon.c,v
retrieving revision 1.25
diff -u -r1.25 exticon.c
--- dlls/user/exticon.c 12 Dec 2002 22:59:50 -0000 1.25
+++ dlls/user/exticon.c 6 Jan 2003 04:31:12 -0000
@@ -31,6 +31,8 @@
# include <unistd.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "windef.h"
#include "winerror.h"
Index: dlls/version/resource.c
===================================================================
RCS file: /var/cvs/wine/dlls/version/resource.c,v
retrieving revision 1.25
diff -u -r1.25 resource.c
--- dlls/version/resource.c 17 Aug 2002 00:43:17 -0000 1.25
+++ dlls/version/resource.c 6 Jan 2003 05:05:09 -0000
@@ -29,6 +29,8 @@
# include <unistd.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "lzexpand.h"
Index: dlls/winedos/int2f.c
===================================================================
RCS file: /var/cvs/wine/dlls/winedos/int2f.c,v
retrieving revision 1.2
diff -u -r1.2 int2f.c
--- dlls/winedos/int2f.c 2 Jan 2003 17:59:47 -0000 1.2
+++ dlls/winedos/int2f.c 6 Jan 2003 05:33:36 -0000
@@ -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"
Index: dlls/winedos/vga.c
===================================================================
RCS file: /var/cvs/wine/dlls/winedos/vga.c,v
retrieving revision 1.26
diff -u -r1.26 vga.c
--- dlls/winedos/vga.c 2 Dec 2002 18:10:58 -0000 1.26
+++ dlls/winedos/vga.c 6 Jan 2003 05:33:57 -0000
@@ -19,6 +19,9 @@
*/
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
Index: dlls/wineps/driver.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/driver.c,v
retrieving revision 1.17
diff -u -r1.17 driver.c
--- dlls/wineps/driver.c 4 Nov 2002 22:37:57 -0000 1.17
+++ dlls/wineps/driver.c 6 Jan 2003 05:08:26 -0000
@@ -23,6 +23,9 @@
*/
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "psdrv.h"
#include "wine/debug.h"
#include "winuser.h"
Index: dlls/wineps/init.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/init.c,v
retrieving revision 1.42
diff -u -r1.42 init.c
--- dlls/wineps/init.c 12 Nov 2002 02:22:24 -0000 1.42
+++ dlls/wineps/init.c 6 Jan 2003 05:08:52 -0000
@@ -27,6 +27,8 @@
# include <unistd.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "gdi.h"
#include "psdrv.h"
#include "wine/debug.h"
Index: dlls/wineps/ps.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/ps.c,v
retrieving revision 1.14
diff -u -r1.14 ps.c
--- dlls/wineps/ps.c 15 Nov 2002 00:02:13 -0000 1.14
+++ dlls/wineps/ps.c 6 Jan 2003 05:09:18 -0000
@@ -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"
Index: dlls/winmm/mmsystem.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/mmsystem.c,v
retrieving revision 1.88
diff -u -r1.88 mmsystem.c
--- dlls/winmm/mmsystem.c 15 Dec 2002 02:59:50 -0000 1.88
+++ dlls/winmm/mmsystem.c 6 Jan 2003 04:35:02 -0000
@@ -32,6 +32,8 @@
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "mmsystem.h"
#include "winbase.h"
Index: dlls/winmm/winmm.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/winmm.c,v
retrieving revision 1.12
diff -u -r1.12 winmm.c
--- dlls/winmm/winmm.c 15 Dec 2002 02:59:50 -0000 1.12
+++ dlls/winmm/winmm.c 6 Jan 2003 04:35:54 -0000
@@ -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 */
Index: dlls/winmm/wineoss/mixer.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/wineoss/mixer.c,v
retrieving revision 1.19
diff -u -r1.19 mixer.c
--- dlls/winmm/wineoss/mixer.c 23 Dec 2002 02:05:30 -0000 1.19
+++ dlls/winmm/wineoss/mixer.c 6 Jan 2003 05:34:10 -0000
@@ -36,6 +36,8 @@
# include <sys/ioctl.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "mmddk.h"
#include "oss.h"
Index: dlls/winspool/info.c
===================================================================
RCS file: /var/cvs/wine/dlls/winspool/info.c,v
retrieving revision 1.64
diff -u -r1.64 info.c
--- dlls/winspool/info.c 3 Jan 2003 03:04:46 -0000 1.64
+++ dlls/winspool/info.c 6 Jan 2003 05:36:04 -0000
@@ -23,8 +23,6 @@
*/
#include "config.h"
-#include "wine/port.h"
-#include "wine/library.h"
#include <stdio.h>
#include <stdlib.h>
@@ -37,6 +35,11 @@
# define CUPS_SONAME "libcups.so"
# endif
#endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "wine/port.h"
+#include "wine/library.h"
#include "winspool.h"
#include "winbase.h"
#include "winerror.h"
Index: dlls/x11drv/dga2.c
===================================================================
RCS file: /var/cvs/wine/dlls/x11drv/dga2.c,v
retrieving revision 1.13
diff -u -r1.13 dga2.c
--- dlls/x11drv/dga2.c 25 Oct 2002 21:04:35 -0000 1.13
+++ dlls/x11drv/dga2.c 6 Jan 2003 03:40:53 -0000
@@ -22,6 +22,8 @@
#ifdef HAVE_LIBXXF86DGA2
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "ts_xlib.h"
#include <X11/extensions/xf86dga.h>
Index: dlls/x11drv/keyboard.c
===================================================================
RCS file: /var/cvs/wine/dlls/x11drv/keyboard.c,v
retrieving revision 1.16
diff -u -r1.16 keyboard.c
--- dlls/x11drv/keyboard.c 19 Dec 2002 21:14:47 -0000 1.16
+++ dlls/x11drv/keyboard.c 6 Jan 2003 03:41:26 -0000
@@ -38,6 +38,8 @@
#include <ctype.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
Index: dlls/x11drv/mouse.c
===================================================================
RCS file: /var/cvs/wine/dlls/x11drv/mouse.c,v
retrieving revision 1.10
diff -u -r1.10 mouse.c
--- dlls/x11drv/mouse.c 24 Sep 2002 18:36:51 -0000 1.10
+++ dlls/x11drv/mouse.c 6 Jan 2003 03:41:53 -0000
@@ -25,6 +25,8 @@
#include <X11/extensions/xf86dga.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "wine/winuser16.h"
Index: dlls/x11drv/x11ddraw.c
===================================================================
RCS file: /var/cvs/wine/dlls/x11drv/x11ddraw.c,v
retrieving revision 1.18
diff -u -r1.18 x11ddraw.c
--- dlls/x11drv/x11ddraw.c 30 Nov 2002 01:53:13 -0000 1.18
+++ dlls/x11drv/x11ddraw.c 6 Jan 2003 03:42:27 -0000
@@ -22,6 +22,8 @@
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "ts_xlib.h"
#include "x11drv.h"
#include "x11ddraw.h"
Index: files/drive.c
===================================================================
RCS file: /var/cvs/wine/files/drive.c,v
retrieving revision 1.81
diff -u -r1.81 drive.c
--- files/drive.c 23 Dec 2002 01:35:49 -0000 1.81
+++ files/drive.c 6 Jan 2003 03:48:16 -0000
@@ -54,6 +54,8 @@
# endif
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winternl.h"
#include "wine/winbase16.h" /* for GetCurrentTask */
Index: files/file.c
===================================================================
RCS file: /var/cvs/wine/files/file.c,v
retrieving revision 1.174
diff -u -r1.174 file.c
--- files/file.c 2 Jan 2003 19:24:42 -0000 1.174
+++ files/file.c 6 Jan 2003 03:48:25 -0000
@@ -55,6 +55,8 @@
# include <utime.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "windef.h"
#include "winbase.h"
Index: include/winnt.h
===================================================================
RCS file: /var/cvs/wine/include/winnt.h,v
retrieving revision 1.149
diff -u -r1.149 winnt.h
--- include/winnt.h 4 Jan 2003 00:52:19 -0000 1.149
+++ include/winnt.h 6 Jan 2003 02:59:47 -0000
@@ -136,18 +136,13 @@
/* Anonymous union/struct handling */
-#ifdef __WINESRC__
-# define NONAMELESSSTRUCT
-# define NONAMELESSUNION
-#else
/* Anonymous struct support starts with gcc 2.96 or gcc/g++ 3.x */
-# if !defined(NONAMELESSSTRUCT) && (defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && (defined(__cplusplus) || (__GNUC_MINOR__ < 96))))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# define NONAMELESSSTRUCT
-# endif
+#if !defined(NONAMELESSSTRUCT) && (defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && (defined(__cplusplus) || (__GNUC_MINOR__ < 96))))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# define NONAMELESSSTRUCT
+#endif
/* Anonymous unions support starts with gcc 2.96/g++ 2.95 */
-# if !defined(NONAMELESSUNION) && (defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ < 95) || ((__GNUC_MINOR__ == 95) && !defined(__cplusplus)))))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# define NONAMELESSUNION
-# endif
+#if !defined(NONAMELESSUNION) && (defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ < 95) || ((__GNUC_MINOR__ == 95) && !defined(__cplusplus)))))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# define NONAMELESSUNION
#endif
#ifndef NONAMELESSSTRUCT
Index: library/loader.c
===================================================================
RCS file: /var/cvs/wine/library/loader.c,v
retrieving revision 1.19
diff -u -r1.19 loader.c
--- library/loader.c 10 Dec 2002 22:56:44 -0000 1.19
+++ library/loader.c 6 Jan 2003 03:08:34 -0000
@@ -30,6 +30,8 @@
#include <sys/mman.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "wine/library.h"
Index: loader/pe_resource.c
===================================================================
RCS file: /var/cvs/wine/loader/pe_resource.c,v
retrieving revision 1.39
diff -u -r1.39 pe_resource.c
--- loader/pe_resource.c 12 Sep 2002 22:07:05 -0000 1.39
+++ loader/pe_resource.c 6 Jan 2003 03:49:18 -0000
@@ -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"
Index: memory/heap.c
===================================================================
RCS file: /var/cvs/wine/memory/heap.c,v
retrieving revision 1.59
diff -u -r1.59 heap.c
--- memory/heap.c 21 Sep 2002 01:21:00 -0000 1.59
+++ memory/heap.c 6 Jan 2003 03:50:01 -0000
@@ -26,6 +26,8 @@
#include <stdio.h>
#include <string.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "wine/winbase16.h"
#include "winerror.h"
Index: memory/virtual.c
===================================================================
RCS file: /var/cvs/wine/memory/virtual.c,v
retrieving revision 1.89
diff -u -r1.89 virtual.c
--- memory/virtual.c 12 Dec 2002 23:34:01 -0000 1.89
+++ memory/virtual.c 6 Jan 2003 03:50:30 -0000
@@ -29,6 +29,8 @@
# include <unistd.h>
#endif
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winnls.h"
#include "winbase.h"
#include "winternl.h"
Index: misc/cpu.c
===================================================================
RCS file: /var/cvs/wine/misc/cpu.c,v
retrieving revision 1.29
diff -u -r1.29 cpu.c
--- misc/cpu.c 13 Sep 2002 18:52:01 -0000 1.29
+++ misc/cpu.c 6 Jan 2003 03:50:48 -0000
@@ -26,6 +26,8 @@
#include <string.h>
#include <stdio.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winbase.h"
#include "winnt.h"
#include "winternl.h"
Index: misc/system.c
===================================================================
RCS file: /var/cvs/wine/misc/system.c,v
retrieving revision 1.23
diff -u -r1.23 system.c
--- misc/system.c 31 Aug 2002 18:47:01 -0000 1.23
+++ misc/system.c 6 Jan 2003 03:51:13 -0000
@@ -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"
Index: msdos/vxd.c
===================================================================
RCS file: /var/cvs/wine/msdos/vxd.c,v
retrieving revision 1.42
diff -u -r1.42 vxd.c
--- msdos/vxd.c 20 Nov 2002 19:40:12 -0000 1.42
+++ msdos/vxd.c 6 Jan 2003 03:52:00 -0000
@@ -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"
Index: scheduler/timer.c
===================================================================
RCS file: /var/cvs/wine/scheduler/timer.c,v
retrieving revision 1.16
diff -u -r1.16 timer.c
--- scheduler/timer.c 25 Nov 2002 20:51:31 -0000 1.16
+++ scheduler/timer.c 6 Jan 2003 03:53:35 -0000
@@ -23,6 +23,9 @@
#include <assert.h>
#include <string.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "winerror.h"
#include "winnls.h"
#include "wine/unicode.h"
Index: tools/winedump/pe.c
===================================================================
RCS file: /var/cvs/wine/tools/winedump/pe.c,v
retrieving revision 1.19
diff -u -r1.19 pe.c
--- tools/winedump/pe.c 10 Dec 2002 22:56:43 -0000 1.19
+++ tools/winedump/pe.c 6 Jan 2003 03:16:02 -0000
@@ -38,6 +38,8 @@
#endif
#include <fcntl.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winedump.h"
#include "pe.h"
Index: win32/newfns.c
===================================================================
RCS file: /var/cvs/wine/win32/newfns.c,v
retrieving revision 1.43
diff -u -r1.43 newfns.c
--- win32/newfns.c 21 Nov 2002 03:45:01 -0000 1.43
+++ win32/newfns.c 6 Jan 2003 03:54:04 -0000
@@ -32,6 +32,9 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
Index: windows/input.c
===================================================================
RCS file: /var/cvs/wine/windows/input.c,v
retrieving revision 1.88
diff -u -r1.88 input.c
--- windows/input.c 10 Dec 2002 19:05:12 -0000 1.88
+++ windows/input.c 6 Jan 2003 04:24:33 -0000
@@ -28,6 +28,8 @@
#include <ctype.h>
#include <assert.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winnls.h"
#include "winbase.h"
--
Dimi.
