summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-31 05:35:27 -0700
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-31 05:35:27 -0700
commit831003156c77c811e7f1fcb65811d1d099587442 (patch)
treec44f4f2509bb39af377054e1cd4b73b927c6c94a
parentc01c487c6226cbe72e63a7cd5519a5c87aa10f71 (diff)
parent54de4afd75ba7102925484fd5ed1d6fba3df46f6 (diff)
downloadminetest-831003156c77c811e7f1fcb65811d1d099587442.tar.gz
minetest-831003156c77c811e7f1fcb65811d1d099587442.tar.bz2
minetest-831003156c77c811e7f1fcb65811d1d099587442.zip
Merge pull request #44 from SpeedProg/master
last fix was shit, so a fix for the fix -_-
-rw-r--r--src/gettext.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gettext.h b/src/gettext.h
index b62421c78..ff3a0f8cb 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -13,8 +13,8 @@
inline void init_gettext(const char *path) {
#if USE_GETTEXT
- #if MSVC
- #else
+ // don't do this if MSVC compiler is used, it gives an assertion fail
+ #ifndef _MSC_VER
setlocale(LC_MESSAGES, "");
#endif
bindtextdomain(PROJECT_NAME, path);