From 7e99b60d2f70bd348137f0c4ad054011afd71fbc Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 8 Sep 2022 15:37:52 -0700
Subject: [PATCH] Revert "Fixed ABI change in
https://github.com/libsdl-org/sdl12-compat/commit/52459d2b8a68f77afda504da4e93887c8ed1fbd0"
This reverts commit 0708d1e9a774fc2dca04af9805e660b1e53ebc24.
There were concerns with changing the size of SDL_SysWMinfo so we're not going to go that route.
---
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 c96d7865..4321a07a 100644
--- a/include/SDL/SDL_syswm.h
+++ b/include/SDL/SDL_syswm.h
@@ -32,8 +32,6 @@ 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
@@ -55,7 +53,6 @@ typedef struct SDL_Window SDL_Window;
SDL_version version;
HWND window;
HGLRC hglrc;
- SDL_Window *sdl2_window;
} SDL_SysWMinfo;
# include "close_code.h"
@@ -95,7 +92,6 @@ typedef struct SDL_Window SDL_Window;
Display *gfxdisplay;
} x11;
} info;
- SDL_Window *sdl2_window;
} SDL_SysWMinfo;
# include "close_code.h"
@@ -113,8 +109,7 @@ typedef struct SDL_Window SDL_Window;
typedef struct SDL_SysWMinfo
{
SDL_version version;
- int data;
- SDL_Window *sdl2_window;
+ void *data;
} SDL_SysWMinfo;
# include "close_code.h"
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index fa19762c..2a379826 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -634,7 +634,6 @@ typedef struct SDL12_SysWMinfo
#else
int data; /* unused at the moment. */
#endif
- SDL_Window *sdl2_window;
} SDL12_SysWMinfo;
typedef enum
@@ -6983,7 +6982,13 @@ SDL_GetWMInfo(SDL12_SysWMinfo *info12)
if (info12->version.major > 1) {
if (info12->version.major == 2) {
- info12->sdl2_window = VideoWindow20;
+#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
return 1;
}
SDL20_SetError("Requested version is unsupported");