# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1285820032 25200
# Node ID 50d0bff24d813173936e53ff872101e90abc7017
# Parent  deadc1219bea59dd38b051c2745d4a68ecbec2ae
Make the union nameless to reduce the complexity of the API.
(Are there any compilers still in use that don't support this?)

diff -r deadc1219bea -r 50d0bff24d81 include/SDL_syswm.h
--- a/include/SDL_syswm.h	Mon Sep 27 01:30:42 2010 -0700
+++ b/include/SDL_syswm.h	Wed Sep 29 21:13:52 2010 -0700
@@ -133,7 +133,7 @@
             /* No Cocoa window events yet */
         } cocoa;
 #endif
-    } msg;
+    } /*msg*/;
 };
 
 /**
@@ -175,7 +175,7 @@
             NSWindow *window;
         } cocoa;
 #endif
-    } info;
+    } /*info*/;
 };
 
 #endif /* SDL_PROTOTYPES_ONLY */
diff -r deadc1219bea -r 50d0bff24d81 src/video/cocoa/SDL_cocoawindow.m
--- a/src/video/cocoa/SDL_cocoawindow.m	Mon Sep 27 01:30:42 2010 -0700
+++ b/src/video/cocoa/SDL_cocoawindow.m	Wed Sep 29 21:13:52 2010 -0700
@@ -708,7 +708,7 @@
 
     if (info->version.major <= SDL_MAJOR_VERSION) {
         info->subsystem = SDL_SYSWM_COCOA;
-        info->info.cocoa.window = nswindow;
+        info->cocoa.window = nswindow;
         return SDL_TRUE;
     } else {
         SDL_SetError("Application not compiled with SDL %d.%d\n",
diff -r deadc1219bea -r 50d0bff24d81 src/video/win32/SDL_win32events.c
--- a/src/video/win32/SDL_win32events.c	Mon Sep 27 01:30:42 2010 -0700
+++ b/src/video/win32/SDL_win32events.c	Wed Sep 29 21:13:52 2010 -0700
@@ -114,10 +114,10 @@
 
         SDL_VERSION(&wmmsg.version);
         wmmsg.subsystem = SDL_SYSWM_WINDOWS;
-        wmmsg.msg.win.hwnd = hwnd;
-        wmmsg.msg.win.msg = msg;
-        wmmsg.msg.win.wParam = wParam;
-        wmmsg.msg.win.lParam = lParam;
+        wmmsg.win.hwnd = hwnd;
+        wmmsg.win.msg = msg;
+        wmmsg.win.wParam = wParam;
+        wmmsg.win.lParam = lParam;
         SDL_SendSysWMEvent(&wmmsg);
     }
 
diff -r deadc1219bea -r 50d0bff24d81 src/video/win32/SDL_win32window.c
--- a/src/video/win32/SDL_win32window.c	Mon Sep 27 01:30:42 2010 -0700
+++ b/src/video/win32/SDL_win32window.c	Wed Sep 29 21:13:52 2010 -0700
@@ -552,7 +552,7 @@
     HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
     if (info->version.major <= SDL_MAJOR_VERSION) {
         info->subsystem = SDL_SYSWM_WINDOWS;
-        info->info.win.window = hwnd;
+        info->win.window = hwnd;
         return SDL_TRUE;
     } else {
         SDL_SetError("Application not compiled with SDL %d.%d\n",
diff -r deadc1219bea -r 50d0bff24d81 src/video/x11/SDL_x11events.c
--- a/src/video/x11/SDL_x11events.c	Mon Sep 27 01:30:42 2010 -0700
+++ b/src/video/x11/SDL_x11events.c	Wed Sep 29 21:13:52 2010 -0700
@@ -90,7 +90,7 @@
 
         SDL_VERSION(&wmmsg.version);
         wmmsg.subsystem = SDL_SYSWM_X11;
-        wmmsg.msg.x11.event = xevent;
+        wmmsg.x11.event = xevent;
         SDL_SendSysWMEvent(&wmmsg);
     }
 
diff -r deadc1219bea -r 50d0bff24d81 src/video/x11/SDL_x11window.c
--- a/src/video/x11/SDL_x11window.c	Mon Sep 27 01:30:42 2010 -0700
+++ b/src/video/x11/SDL_x11window.c	Wed Sep 29 21:13:52 2010 -0700
@@ -1125,8 +1125,8 @@
     if (info->version.major == SDL_MAJOR_VERSION &&
         info->version.minor == SDL_MINOR_VERSION) {
         info->subsystem = SDL_SYSWM_X11;
-        info->info.x11.display = display;
-        info->info.x11.window = data->xwindow;
+        info->x11.display = display;
+        info->x11.window = data->xwindow;
         return SDL_TRUE;
     } else {
         SDL_SetError("Application not compiled with SDL %d.%d\n",