X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgettext.h;h=d7fc586c0fc56bc4d7a9ac8412745fc0d47bf0b5;hb=5f489efc69e5e8e31891481d412ad569a6e1bcf8;hp=b8d27f77ceb82a2b229ba8e01b24b4baf461a0cd;hpb=2d207afe8e12f00b5a1276a678e2402c3c4c7961;p=oweals%2Fminetest.git

diff --git a/src/gettext.h b/src/gettext.h
index b8d27f77c..d7fc586c0 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -17,14 +17,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GETTEXT_HEADER
-#define GETTEXT_HEADER
+#pragma once
 
 #include "config.h" // for USE_GETTEXT
+#include <string>
 
 #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
 
@@ -48,5 +58,3 @@ inline std::string strgettext(const std::string &text)
 {
 	return gettext(text.c_str());
 }
-
-#endif