* lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform

[gnu-emacs] / lib / gettext.h

diff --git a/lib/gettext.h b/lib/gettext.h
index eb74aecb9a8471e3cd8bf2dd72f219fc5bf4f292..458e33221772ccc3fc08bd2a5cdcd0300699b0b0 100644 (file)
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -93,6 +93,12 @@
 
 #endif
 
+/* Prefer gnulib's setlocale override over libintl's setlocale override.  */
+#ifdef GNULIB_defined_setlocale
+# undef setlocale
+# define setlocale rpl_setlocale
+#endif
+
 /* A pseudo function call that serves as a marker for the automated
    extraction of messages, but does not call gettext().  The run-time
    translation is done at a different place in the code.