Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

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

diff --git a/src/gettext.h b/src/gettext.h
index cb3a141608036300ddd65781571748f365f05df2..885d7ca2da165691cf5e1c38a2394b175cd26d87 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -25,6 +25,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if USE_GETTEXT
        #include <libintl.h>
 #else
+       // 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
 
@@ -32,12 +42,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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, const char *argv[]);
-#else
-void init_gettext(const char *path, const std::string &configured_language);
-#endif
+       int argc, char *argv[]);
 
 extern wchar_t *utf8_to_wide_c(const char *str);