From 08b5def22f66d4baa04bcca382fd5e8df5fcb7e1 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Thu, 24 Jun 2021 15:49:01 -0400
Subject: [PATCH] Check for win32 define before x11, in case the win32 machine
has X11 support.
---
include/SDL/SDL_syswm.h | 52 ++++++++++++++++++++---------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/include/SDL/SDL_syswm.h b/include/SDL/SDL_syswm.h
index 65666da..187b34e 100644
--- a/include/SDL/SDL_syswm.h
+++ b/include/SDL/SDL_syswm.h
@@ -32,7 +32,32 @@ real SDL-1.2 available to you. */
#ifndef SDL_PROTOTYPES_ONLY
-# if defined(SDL_VIDEO_DRIVER_X11)
+# if defined(__WIN32__)
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
+# include <windows.h>
+
+# include "begin_code.h"
+
+ typedef struct SDL_SysWMmsg
+ {
+ SDL_version version;
+ HWND hwnd;
+ UINT msg;
+ WPARAM wParam;
+ LPARAM lParam;
+ } SDL_SysWMmsg;
+
+ typedef struct SDL_SysWMinfo {
+ SDL_version version;
+ HWND window;
+ HGLRC hglrc;
+ } SDL_SysWMinfo;
+
+# include "close_code.h"
+
+# elif defined(SDL_VIDEO_DRIVER_X11)
# include <X11/Xlib.h>
# include <X11/Xatom.h>
@@ -71,31 +96,6 @@ real SDL-1.2 available to you. */
# include "close_code.h"
-# elif defined(__WIN32__)
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-# include <windows.h>
-
-# include "begin_code.h"
-
- typedef struct SDL_SysWMmsg
- {
- SDL_version version;
- HWND hwnd;
- UINT msg;
- WPARAM wParam;
- LPARAM lParam;
- } SDL_SysWMmsg;
-
- typedef struct SDL_SysWMinfo {
- SDL_version version;
- HWND window;
- HGLRC hglrc;
- } SDL_SysWMinfo;
-
-# include "close_code.h"
-
# else
# include "begin_code.h"