X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a3e44e793796153ff1534be9c74fcab50b45de30..6c06b142a0acf592e28921209d2fe684738e600d:/lib/gettext.h

diff --git a/lib/gettext.h b/lib/gettext.h
index eb74aecb9a..458e332217 100644
--- 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.