synced trunk with experimental r.7055

git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@7056 0b2b3880-5936-4365-a048-eb17d2e5a6bf
TeX-Live · Jan 22, 2019 · 49c7c10 · 49c7c10
1 parent 7c34653
commit 49c7c10
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/source/texk/web2c/cwebboot.cin b/source/texk/web2c/cwebboot.cin
@@ -33,22 +33,22 @@
 /*: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
 #endif
 
 /*:88*//*90:*/
-#line 1305 "cwebdir/comm-w2c.ch"
+#line 1301 "cwebdir/comm-w2c.ch"
 
 typedef bool boolean;
 #define HAVE_BOOLEAN
@@ -423,7 +423,7 @@ static void check_change(void);
 static void prime_the_change_buffer(void);
 
 /*:84*//*98:*/
-#line 1406 "cwebdir/comm-w2c.ch"
+#line 1402 "cwebdir/comm-w2c.ch"
 
 static void cb_usage(const_string str);
 static void cb_usagehelp(const_string*message,const_string bug_email);
@@ -463,7 +463,7 @@ root= NULL;
 #line 72 "cwebdir/comm-w2c.ch"
 
 /*91:*/
-#line 1320 "cwebdir/comm-w2c.ch"
+#line 1316 "cwebdir/comm-w2c.ch"
 
 kpse_set_program_name(argv[0],"cweb");
 
@@ -473,11 +473,7 @@ kpse_set_program_name(argv[0],"cweb");
 /*89:*/
 #line 1267 "cwebdir/comm-w2c.ch"
 
-#if !defined(__MINGW32__)
 setlocale(LC_MESSAGES,setlocale(LC_CTYPE,""));
-#else
-setlocale(LC_CTYPE,"");
-#endif
 texmf_locale= kpse_var_expand("${TEXMFLOCALEDIR}");
 
 bindtextdomain("cweb",
@@ -1433,7 +1429,7 @@ if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*74:*/
 if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0)
 
 /*94:*/
-#line 1345 "cwebdir/comm-w2c.ch"
+#line 1341 "cwebdir/comm-w2c.ch"
 
 cb_usagehelp(program==ctangle?CTANGLEHELP:
 program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
@@ -1445,7 +1441,7 @@ program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
 if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
 
 /*96:*/
-#line 1387 "cwebdir/comm-w2c.ch"
+#line 1383 "cwebdir/comm-w2c.ch"
 
 printversionandexit(cb_banner,
 program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
@@ -1635,7 +1631,7 @@ cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
 
 #line 953 "cwebdir/comm-w2c.ch"
 /*:70*//*95:*/
-#line 1353 "cwebdir/comm-w2c.ch"
+#line 1349 "cwebdir/comm-w2c.ch"
 
 static void cb_usage(const_string str)
 {
@@ -1668,7 +1664,7 @@ history= spotless;exit(wrap_up());
 }
 
 /*:95*//*97:*/
-#line 1395 "cwebdir/comm-w2c.ch"
+#line 1391 "cwebdir/comm-w2c.ch"
 
 void cb_show_banner(void)
 {

diff --git a/source/texk/web2c/cwebdir/comm-w2c.ch b/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
@@ -1265,11 +1265,7 @@ There are several ways to set |TEXMFLOCALEDIR|:
     or \.{TEXMFLOCALEDIR.cweb=\$TEXMFMAIN/locale}.\par}
 
 @<Set locale...@>=
-#if !defined(__MINGW32__)
 setlocale(LC_MESSAGES, setlocale(LC_CTYPE, ""));
-#else
-setlocale(LC_CTYPE, "");
-#endif
 texmf_locale = kpse_var_expand ("${TEXMFLOCALEDIR}");
 
 bindtextdomain("cweb",

diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 7047
+#define luatex_svn_revision 7055
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define luatex_svn_revision 7047
		#define luatex_svn_revision 7055