Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

[oweals/minetest.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index dce45fa3aafd3b339bbf843cbcb6fc5ab3b53c5b..885d7ca2da165691cf5e1c38a2394b175cd26d87 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -23,37 +23,35 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h" // for USE_GETTEXT
 
 #if USE_GETTEXT
-#include <libintl.h>
+       #include <libintl.h>
 #else
-#define gettext(String) String
+       // In certain environments, some standard headers like <iomanip>
+       // and <locale> include libintl.h. If libintl.h is included after
+       // we define our gettext macro below, this causes a syntax error
+       // at the declaration of the gettext function in libintl.h.
+       // Fix this by including such a header before defining the macro.
+       // See issue #4446.
+       // Note that we can't include libintl.h directly since we're in
+       // the USE_GETTEXT=0 case and can't assume that gettext is installed.
+       #include <locale>
+
+       #define gettext(String) String
 #endif
 
 #define _(String) gettext(String)
-#define gettext_noop(String) String
-#define N_(String) gettext_noop (String)
+#define gettext_noop(String) (String)
+#define N_(String) gettext_noop((String))
 
-#ifdef _MSC_VER
-void init_gettext(const char *path, const std::string &configured_language, int argc, char** argv);
-#else
-void init_gettext(const char *path, const std::string &configured_language);
-#endif
+void init_gettext(const char *path, const std::string &configured_language,
+       int argc, char *argv[]);
 
-extern const wchar_t *narrow_to_wide_c(const char *mbs);
-extern std::wstring narrow_to_wide(const std::string &mbs);
+extern wchar_t *utf8_to_wide_c(const char *str);
 
 // You must free the returned string!
+// The returned string is allocated using new
 inline const wchar_t *wgettext(const char *str)
 {
-       return narrow_to_wide_c(gettext(str));
-}
-
-// Gettext under MSVC needs this strange way. Just don't ask...
-inline std::wstring wstrgettext(const std::string &text)
-{
-       const wchar_t *tmp = wgettext(text.c_str());
-       std::wstring retval = (std::wstring)tmp;
-       delete[] tmp;
-       return retval;
+       return utf8_to_wide_c(gettext(str));
 }
 
 inline std::string strgettext(const std::string &text)