This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 9c20f275a015536e95446162a4509191809b5fe7
Author: krzys-h <krzy...@interia.pl>
Date: Sat Mar 21 17:34:18 2015 +0100
Fixed MXE builds after 87cf056158c9cb208b6fb2701118c82a2f29e660
On MXE, setlocale is a macro...
---
src/app/app.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 72adb0f..7941d69 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -1683,9 +1683,9 @@ void CApplication::SetLanguage(Language language)
GetLogger()->Trace("SetLanguage: Set LANGUAGE=%s in environment\n",
locale.c_str());
}
- std::setlocale(LC_ALL, ""); // Load system locale
- std::setlocale(LC_NUMERIC, "C"); // Force numeric locale to "C" (fixes
decimal point problems)
- char* systemLocale = std::setlocale(LC_ALL, nullptr); // Get current
locale configuration
+ setlocale(LC_ALL, ""); // Load system locale
+ setlocale(LC_NUMERIC, "C"); // Force numeric locale to "C" (fixes decimal
point problems)
+ char* systemLocale = setlocale(LC_ALL, nullptr); // Get current locale
configuration
GetLogger()->Debug("System locale: %s\n", systemLocale);
// Update C++ locale
try
@@ -1698,7 +1698,7 @@ void CApplication::SetLanguage(Language language)
try
{
std::locale::global(std::locale::classic());
- std::setlocale(LC_ALL, systemLocale); // C locale might still work
correctly
+ setlocale(LC_ALL, systemLocale); // C locale might still work
correctly
}
catch(...)
{
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
