From 63b41440a0555c6b39141eab94ef4627f712b476 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Sun, 29 Mar 2009 18:31:29 +0200
Subject: Fixed compilation on Windows

---
 src/gui/setup_colors.cpp | 2 +-
 src/gui/truetypefont.h   | 4 ++++
 src/main.cpp             | 7 ++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 073bbc1a..caa53e2d 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -401,7 +401,7 @@ void Setup_Colors::updateColor()
 
     Palette::ColorType type = guiPalette->getColorTypeAt(mSelected);
     Palette::GradientType grad =
-            static_cast<Palette::GradientType>(mGradTypeSlider->getValue());
+            static_cast<Palette::GradientType>((int)mGradTypeSlider->getValue());
     guiPalette->setGradient(type, grad);
 
     if (grad == Palette::STATIC)
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index cbe64368..25dcbe44 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -29,8 +29,12 @@
 #ifdef __APPLE__
 #include <SDL_ttf/SDL_ttf.h>
 #else
+#ifdef __WIN32__
+#include <SDL/SDL_ttf.h>
+#else
 #include <SDL_ttf.h>
 #endif
+#endif
 
 class TextChunk;
 
diff --git a/src/main.cpp b/src/main.cpp
index 8fe1de86..8f04122c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -985,6 +985,9 @@ static void reconnectAccount(const std::string &passToken)
 
 #endif
 
+
+extern "C" char const *_nl_locale_name_default(void);
+
 static void initInternationalization()
 {
 #if ENABLE_NLS
@@ -1017,8 +1020,6 @@ static void initXML()
     xmlSetGenericErrorFunc(NULL, xmlNullLogger);
 }
 
-extern "C" char const *_nl_locale_name_default(void);
-
 /** Main */
 int main(int argc, char *argv[])
 {
@@ -1207,7 +1208,7 @@ int main(int argc, char *argv[])
         {
             state = STATE_ERROR;
 
-            if (!network->getError().empty()) 
+            if (!network->getError().empty())
                 errorMessage = network->getError();
             else
                 errorMessage = _("Got disconnected from server!");
-- 
cgit v1.2.3-70-g09d2