# HG changeset patch # User Sam Lantinga # Date 1295637799 28800 # Node ID 7e4c7790700e3732c20be7f2d159b81c87c1873a # Parent eae20af0b9832956fc8f5ef1cbc42c95db901c42 Fixed compile error on Mac OS X diff -r eae20af0b983 -r 7e4c7790700e include/SDL_syswm.h --- a/include/SDL_syswm.h Thu Jan 20 18:42:41 2011 -0800 +++ b/include/SDL_syswm.h Fri Jan 21 11:23:19 2011 -0800 @@ -125,28 +125,31 @@ WPARAM wParam; /**< WORD message parameter */ LPARAM lParam; /**< LONG message parameter */ } win; -#elif defined(SDL_VIDEO_DRIVER_X11) +#endif +#if defined(SDL_VIDEO_DRIVER_X11) struct { XEvent event; } x11; -#elif defined(SDL_VIDEO_DRIVER_DIRECTFB) +#endif +#if defined(SDL_VIDEO_DRIVER_DIRECTFB) struct { DFBEvent event; } dfb; -#elif defined(SDL_VIDEO_DRIVER_COCOA) +#endif +#if defined(SDL_VIDEO_DRIVER_COCOA) struct { /* No Cocoa window events yet */ } cocoa; -#elif defined(SDL_VIDEO_DRIVER_UIKIT) +#endif +#if defined(SDL_VIDEO_DRIVER_UIKIT) struct { /* No UIKit window events yet */ } uikit; -else +#endif /* Can't have an empty union */ int dummy; -#endif } msg; }; @@ -167,33 +170,36 @@ { HWND window; /**< The window handle */ } win; -#elif defined(SDL_VIDEO_DRIVER_X11) +#endif +#if defined(SDL_VIDEO_DRIVER_X11) struct { Display *display; /**< The X11 display */ Window window; /**< The X11 window */ } x11; -#elif defined(SDL_VIDEO_DRIVER_DIRECTFB) +#endif +#if 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; -#elif defined(SDL_VIDEO_DRIVER_COCOA) +#endif +#if defined(SDL_VIDEO_DRIVER_COCOA) struct { NSWindow *window; /* The Cocoa window */ } cocoa; -#elif defined(SDL_VIDEO_DRIVER_UIKIT) +#endif +#if defined(SDL_VIDEO_DRIVER_UIKIT) struct { UIWindow *window; /* The UIKit window */ } uikit; -#else +#endif /* Can't have an empty union */ int dummy; -#endif } info; };