From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 17 Dec 2012 09:53:20 +0000 (+0100)
Subject: only include SDL_syswm.h if really necessary
X-Git-Tag: xonotic-v0.7.0~90
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d62719ed48744ebe5b9b0018d1a4bd146f3f7f5;p=xonotic%2Fdarkplaces.git

only include SDL_syswm.h if really necessary
::stable-branch::merge=b0050acadb01e7e98de898ed66153325e81b0018
---

diff --git a/vid_sdl.c b/vid_sdl.c
index 9484f6c2..aed184b1 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -18,7 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #undef WIN32_LEAN_AND_MEAN  //hush a warning, SDL.h redefines this
 #include <SDL.h>
-#include <SDL_syswm.h>
 #include <stdio.h>
 
 #include "quakedef.h"
@@ -1767,6 +1766,11 @@ static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight,
 // Adding the OS independent XPM version --blub
 #include "darkplaces.xpm"
 #include "nexuiz.xpm"
+#if SDL_MAJOR_VERSION == 1
+#if SDL_VIDEO_DRIVER_X11 && !SDL_VIDEO_DRIVER_QUARTZ
+#include <SDL_syswm.h>
+#endif
+#endif
 static SDL_Surface *icon = NULL;
 static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight, int screenbpp, int screenflags)
 {