CollisionMoveSimple: Collide with 'ignore' nodes

[minetest.git] / src / gettext.cpp

diff --git a/src/gettext.cpp b/src/gettext.cpp
index 26b16f434fedf52a2102f7ac2c28e15b379050d2..81621ba891d10c29326ff7cd85520cb8c887cc12 100644 (file)
--- a/src/gettext.cpp
+++ b/src/gettext.cpp
@@ -18,9 +18,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <string>
-#include <string.h>
+#include <cstring>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 #include "gettext.h"
 #include "util/string.h"
 #include "log.h"
@@ -117,12 +117,8 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) {
 #endif
 
 /******************************************************************************/
-#ifdef _MSC_VER
 void init_gettext(const char *path, const std::string &configured_language,
-       int argc, const char *argv[])
-#else
-void init_gettext(const char *path, const std::string &configured_language)
-#endif
+       int argc, char *argv[])
 {
 #if USE_GETTEXT
        // First, try to set user override environment
@@ -164,7 +160,7 @@ void init_gettext(const char *path, const std::string &configured_language)
 
                        // Allow calling without an extension
                        std::string app_name = argv[0];
-                       if (app_name.compare(appname.size() - 4, 4, ".exe") != 0)
+                       if (app_name.compare(app_name.size() - 4, 4, ".exe") != 0)
                                app_name += ".exe";
 
                        STARTUPINFO startup_info = {0};
@@ -250,4 +246,3 @@ void init_gettext(const char *path, const std::string &configured_language)
        infostream << "Message locale is now set to: "
                        << setlocale(LC_ALL, 0) << std::endl;
 }
-