From 0708d1e9a774fc2dca04af9805e660b1e53ebc24 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 8 Sep 2022 11:14:30 -0700
Subject: [PATCH] Fixed ABI change in
https://github.com/libsdl-org/sdl12-compat/commit/52459d2b8a68f77afda504da4e93887c8ed1fbd0
---
include/SDL/SDL_syswm.h | 7 ++++++-
src/SDL12_compat.c | 9 ++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/SDL/SDL_syswm.h b/include/SDL/SDL_syswm.h
index 4321a07a..c96d7865 100644
--- a/include/SDL/SDL_syswm.h
+++ b/include/SDL/SDL_syswm.h
@@ -32,6 +32,8 @@ real SDL-1.2 available to you. */
#ifndef SDL_PROTOTYPES_ONLY
+typedef struct SDL_Window SDL_Window;
+
# if defined(__WIN32__)
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
@@ -53,6 +55,7 @@ real SDL-1.2 available to you. */
SDL_version version;
HWND window;
HGLRC hglrc;
+ SDL_Window *sdl2_window;
} SDL_SysWMinfo;
# include "close_code.h"
@@ -92,6 +95,7 @@ real SDL-1.2 available to you. */
Display *gfxdisplay;
} x11;
} info;
+ SDL_Window *sdl2_window;
} SDL_SysWMinfo;
# include "close_code.h"
@@ -109,7 +113,8 @@ real SDL-1.2 available to you. */
typedef struct SDL_SysWMinfo
{
SDL_version version;
- void *data;
+ int data;
+ SDL_Window *sdl2_window;
} SDL_SysWMinfo;
# include "close_code.h"
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index 2a379826..fa19762c 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -634,6 +634,7 @@ typedef struct SDL12_SysWMinfo
#else
int data; /* unused at the moment. */
#endif
+ SDL_Window *sdl2_window;
} SDL12_SysWMinfo;
typedef enum
@@ -6982,13 +6983,7 @@ SDL_GetWMInfo(SDL12_SysWMinfo *info12)
if (info12->version.major > 1) {
if (info12->version.major == 2) {
-#if defined(SDL_VIDEO_DRIVER_WINDOWS)
- info12->window = (HWND)VideoWindow20;
-#elif defined(SDL_VIDEO_DRIVER_X11)
- info12->info.x11.gfxdisplay = (Display *)VideoWindow20;
-#else
- info12->data = (void *)VideoWindow20;
-#endif
+ info12->sdl2_window = VideoWindow20;
return 1;
}
SDL20_SetError("Requested version is unsupported");