From dee51b3df2b03793382c05eaaa2aaa66300ddec0 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Mon, 3 Sep 2007 19:17:45 +0000
Subject: [PATCH] Trying to fix SDL definition conflict.

---
 src/gui/qt/sound/sdlplayer.cpp | 5 +++++
 src/gui/qt/sound/sdlplayer.h   | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gui/qt/sound/sdlplayer.cpp b/src/gui/qt/sound/sdlplayer.cpp
index 18e83f10..b525f8ea 100644
--- a/src/gui/qt/sound/sdlplayer.cpp
+++ b/src/gui/qt/sound/sdlplayer.cpp
@@ -11,6 +11,11 @@
 //
 #include "sdlplayer.h"
 
+#if (defined _WIN32) || (defined __APPLE__)
+	#include <SDL.h>
+#else
+	#include <SDL/SDL.h>
+#endif
 
 using namespace std;
 
diff --git a/src/gui/qt/sound/sdlplayer.h b/src/gui/qt/sound/sdlplayer.h
index 55d4eaef..12105613 100644
--- a/src/gui/qt/sound/sdlplayer.h
+++ b/src/gui/qt/sound/sdlplayer.h
@@ -17,13 +17,9 @@
 #include "configfile.h"
 #include "qthelper.h"
 
-// Include SDL here and not in headers to prevent
-// conflicts with QT includes.
 #if (defined _WIN32) || (defined __APPLE__)
-	#include <SDL.h>
 	#include <SDL_mixer.h>
 #else
-	#include <SDL/SDL.h>
 	#include <SDL/SDL_mixer.h>
 #endif