Object properties: Fix loss of custom selectionbox

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

diff --git a/src/gettext.h b/src/gettext.h
index b8d27f77ceb82a2b229ba8e01b24b4baf461a0cd..d7fc586c0fc56bc4d7a9ac8412745fc0d47bf0b5 100644 (file)
--- 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