diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/setup_colors.cpp | 2 | ||||
| -rw-r--r-- | src/gui/truetypefont.h | 4 | ||||
| -rw-r--r-- | src/main.cpp | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index dcd0b73d..ed1b6d09 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 5de5f365..37ef00a2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -980,6 +980,9 @@ static void reconnectAccount(const std::string &passToken) #endif + +extern "C" char const *_nl_locale_name_default(void); + static void initInternationalization() { #if ENABLE_NLS @@ -1012,8 +1015,6 @@ static void initXML() xmlSetGenericErrorFunc(NULL, xmlNullLogger); } -extern "C" char const *_nl_locale_name_default(void); - /** Main */ int main(int argc, char *argv[]) { @@ -1205,7 +1206,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!"); |