From 5ff6cb92f337dbc71f7815b2ba9efddab3ec46f3 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 20 Jan 2011 18:09:55 -0800 Subject: [PATCH] You can't have an empty union in the structure... --- include/SDL_syswm.h | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index eac8045a6..38e75c55b 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -125,28 +125,27 @@ struct SDL_SysWMmsg WPARAM wParam; /**< WORD message parameter */ LPARAM lParam; /**< LONG message parameter */ } win; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) +#elif defined(SDL_VIDEO_DRIVER_X11) struct { XEvent event; } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) +#elif defined(SDL_VIDEO_DRIVER_DIRECTFB) struct { DFBEvent event; } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) +#elif defined(SDL_VIDEO_DRIVER_COCOA) struct { /* No Cocoa window events yet */ } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) +#elif defined(SDL_VIDEO_DRIVER_UIKIT) struct { /* No UIKit window events yet */ } uikit; +else + /* Can't have an empty union */ + int dummy; #endif } msg; }; @@ -168,33 +167,32 @@ struct SDL_SysWMinfo { HWND window; /**< The window handle */ } win; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) +#elif defined(SDL_VIDEO_DRIVER_X11) struct { Display *display; /**< The X11 display */ Window window; /**< The X11 window */ } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) +#elif defined(SDL_VIDEO_DRIVER_DIRECTFB) struct { IDirectFB *dfb; /**< The directfb main interface */ IDirectFBWindow *window; /**< The directfb window handle */ IDirectFBSurface *surface; /**< The directfb client surface */ } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) +#elif defined(SDL_VIDEO_DRIVER_COCOA) struct { NSWindow *window; /* The Cocoa window */ } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) +#elif defined(SDL_VIDEO_DRIVER_UIKIT) struct { UIWindow *window; /* The UIKit window */ } uikit; +#else + /* Can't have an empty union */ + int dummy; #endif } info; };