Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fixed compile error on Mac OS X
- Loading branch information
Showing
with
18 additions
and
12 deletions.
-
+18
−12
include/SDL_syswm.h
|
@@ -125,28 +125,31 @@ struct SDL_SysWMmsg |
|
|
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 @@ struct SDL_SysWMinfo |
|
|
{ |
|
|
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; |
|
|
}; |
|
|
|
|
|