From 300990c5a7d51254c1b65c1e1ad33bd4f2b7609c Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Thu, 8 Sep 2022 13:17:33 -0400
Subject: [PATCH] Revert "syswm: The magic SDL_SysWMinfo2on12 hack reports the
`SDL_Window *` now, too."
This reverts commit f0199bdb25e2a1483eee7a3dccb95565323dd0b4.
---
include/SDL/SDL_syswm.h | 1 -
src/SDL12_compat.c | 2 --
test/testsyswm2on12.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/include/SDL/SDL_syswm.h b/include/SDL/SDL_syswm.h
index 80865d1a..2add7d9b 100644
--- a/include/SDL/SDL_syswm.h
+++ b/include/SDL/SDL_syswm.h
@@ -134,7 +134,6 @@ typedef struct SDL_SysWMinfo2on12
void *data6;
void *data7;
void *data8;
- void *sdl2_window; /* this is the SDL2 SDL_Window */
} SDL_SysWMinfo2on12;
extern DECLSPEC int SDLCALL SDL_GetWMInfo(SDL_SysWMinfo *info);
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index d06e60d0..863b95b2 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -650,7 +650,6 @@ typedef struct SDL12_SysWMinfo2on12
void *data6;
void *data7;
void *data8;
- void *sdl2_window;
} SDL12_SysWMinfo2on12;
@@ -7045,7 +7044,6 @@ SDL_GetWMInfo(SDL12_SysWMinfo *info12)
SDL_zerop(wminfo2);
SDL20_memcpy(&wminfo2->version, &info20.version, sizeof (wminfo2->version));
wminfo2->subsystem = (Uint32) info20.subsystem; /* these do not map to SDL 1.2 values! You're on your own! */
- wminfo2->sdl2_window = VideoWindow20;
switch (info20.subsystem) {
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
diff --git a/test/testsyswm2on12.c b/test/testsyswm2on12.c
index ee2ffa09..73b000df 100644
--- a/test/testsyswm2on12.c
+++ b/test/testsyswm2on12.c
@@ -105,7 +105,6 @@ int main(int argc, char **argv)
printf("data6: %p\n", syswm_info.data6);
printf("data7: %p\n", syswm_info.data7);
printf("data8: %p\n", syswm_info.data8);
- printf("sdl2_window: %p\n", syswm_info.sdl2_window);
}
SDL_Quit();