summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2019-01-21 06:54:02 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2019-01-21 06:54:02 +0000
commit2b4c38730bdadc6587967470347fd61a7bdd4c6d (patch)
tree99d36a7d4a31d8a4dcaaac16e9b3b83dd0d2ea79
parentf7bcd5c3562a61ec44e59dac9fc0b8a897042997 (diff)
Don't set locale without t10n.
MinGW32 in particular and MS Windows in general do not have the LC_MESSAGES facet for i18n. We could squash the facets to LC_ALL, but that is just too much for our purposes. Windows maintainers will have to come up with a more specific solution if they want to activate the gettext stuff. git-svn-id: svn://tug.org/texlive/trunk@49779 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/cwebboot.cin4
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch4
2 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 66cba9d30c4..3d6cd7be7ea 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -33,15 +33,15 @@
/*:85*//*88:*/
#line 1211 "cwebdir/comm-w2c.ch"
-#include <locale.h>
-
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
#endif
#if HAVE_GETTEXT
+#include <locale.h>
#include <libintl.h>
#else
+#define setlocale(A,B) ""
#define bindtextdomain(A,B) ""
#define textdomain(A) ""
#define gettext(A) A
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 0d770b57422..9a0c8dd12f1 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -1209,15 +1209,15 @@ things for neutral behavior without internationalization.
@d _(STRING) gettext(STRING)
@<Include files@>=
-#include <locale.h>
-@#
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
#endif
@#
#if HAVE_GETTEXT
+#include <locale.h>
#include <libintl.h>
#else
+#define setlocale(A,B) ""
#define bindtextdomain(A,B) ""
#define textdomain(A) ""
#define gettext(A) A