From 4bfa4f9fbdee24fee3d009f870b7c025aac4cb36 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Mon, 8 Aug 2022 14:56:58 -0400
Subject: [PATCH] Patched to compile: SDL_SYSWM_TYPE isn't always available in
1.2.
---
include/SDL/SDL_syswm.h | 2 +-
src/SDL12_compat.c | 4 ++--
test/testsyswm2on12.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/SDL/SDL_syswm.h b/include/SDL/SDL_syswm.h
index af193112..2add7d9b 100644
--- a/include/SDL/SDL_syswm.h
+++ b/include/SDL/SDL_syswm.h
@@ -125,7 +125,7 @@ real SDL-1.2 available to you. */
typedef struct SDL_SysWMinfo2on12
{
SDL_version version;
- SDL_SYSWM_TYPE subsystem;
+ Uint32 subsystem;
void *data1;
void *data2;
void *data3;
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index 02290034..523dfc33 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -646,7 +646,7 @@ typedef struct SDL12_SysWMinfo
typedef struct SDL12_SysWMinfo2on12
{
SDL_version version;
- SDL12_SYSWM_TYPE subsystem;
+ Uint32 subsystem;
void *data1;
void *data2;
void *data3;
@@ -6504,7 +6504,7 @@ SDL_GetWMInfo(SDL12_SysWMinfo *info12)
SDL12_SysWMinfo2on12 *wminfo2 = (SDL12_SysWMinfo2on12 *) info12;
SDL_zerop(wminfo2);
SDL20_memcpy(&wminfo2->version, &info20.version, sizeof (wminfo2->version));
- wminfo2->subsystem = info20.subsystem; /* these do not map to SDL 1.2 values! You're on your own! */
+ wminfo2->subsystem = (Uint32) info20.subsystem; /* these do not map to SDL 1.2 values! You're on your own! */
switch (info20.subsystem) {
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
diff --git a/test/testsyswm2on12.c b/test/testsyswm2on12.c
index c4ee0dad..73b000df 100644
--- a/test/testsyswm2on12.c
+++ b/test/testsyswm2on12.c
@@ -13,7 +13,7 @@
typedef struct SDL_SysWMinfo2on12
{
SDL_version version;
- SDL_SYSWM_TYPE subsystem;
+ Uint32 subsystem;
void *data1;
void *data2;
void *data3;
@@ -46,10 +46,10 @@ typedef enum
} SDL20_SYSWM_TYPE;
static const char *
-subsystem_name(const SDL20_SYSWM_TYPE typ)
+subsystem_name(const Uint32 typ)
{
static char unrecognized[64];
- switch (typ) {
+ switch ((SDL20_SYSWM_TYPE) typ) {
case SDL20_SYSWM_UNKNOWN: return "Unknown";
case SDL20_SYSWM_WINDOWS: return "Windows";
case SDL20_SYSWM_X11: return "X11";