From 682bc47bc580710493e4ccd653f611d6503a22f0 Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Tue, 28 Jan 2014 09:13:46 -0300 Subject: [PATCH] Preserve binary compatibility in SDL_SYSWM_TYPE (thanks Gerry JJ!) Also moved Wayland structures to the bottom of the union for OCD related issues. --- include/SDL_syswm.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index c43a78d283fce..c83330bad2b44 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -101,10 +101,10 @@ typedef enum SDL_SYSWM_UNKNOWN, SDL_SYSWM_WINDOWS, SDL_SYSWM_X11, - SDL_SYSWM_WAYLAND, SDL_SYSWM_DIRECTFB, SDL_SYSWM_COCOA, SDL_SYSWM_UIKIT, + SDL_SYSWM_WAYLAND, } SDL_SYSWM_TYPE; /** @@ -176,14 +176,6 @@ struct SDL_SysWMinfo Window window; /**< The X11 window */ } x11; #endif -#if defined(SDL_VIDEO_DRIVER_WAYLAND) - struct - { - struct wl_display *display; /**< Wayland display */ - struct wl_surface *surface; /**< Wayland surface */ - struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ - } wl; -#endif #if defined(SDL_VIDEO_DRIVER_DIRECTFB) struct { @@ -203,6 +195,14 @@ struct SDL_SysWMinfo { UIWindow *window; /* The UIKit window */ } uikit; +#endif +#if defined(SDL_VIDEO_DRIVER_WAYLAND) + struct + { + struct wl_display *display; /**< Wayland display */ + struct wl_surface *surface; /**< Wayland surface */ + struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ + } wl; #endif /* Can't have an empty union */ int dummy;