texlive[48012] Build/source/texk: remove sjisterminal (w32 only)

commits+kakuto at tug.org commits+kakuto at tug.org
Thu Jun 14 05:29:59 CEST 2018


Revision: 48012
          http://tug.org/svn/texlive?view=revision&revision=48012
Author:   kakuto
Date:     2018-06-14 05:29:59 +0200 (Thu, 14 Jun 2018)
Log Message:
-----------
remove sjisterminal (w32 only)

Modified Paths:
--------------
    trunk/Build/source/texk/mendexk/ChangeLog
    trunk/Build/source/texk/mendexk/main.c
    trunk/Build/source/texk/ptexenc/ChangeLog
    trunk/Build/source/texk/ptexenc/ptexenc/ptexenc.h
    trunk/Build/source/texk/ptexenc/ptexenc.c
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/help.h
    trunk/Build/source/texk/web2c/lib/ChangeLog
    trunk/Build/source/texk/web2c/lib/texmfmp.c
    trunk/Build/source/texk/web2c/ptexdir/ChangeLog
    trunk/Build/source/texk/web2c/ptexdir/kanji.c
    trunk/Build/source/texk/web2c/ptexdir/kanji.h
    trunk/Build/source/texk/web2c/ptexdir/pbibtex.ch
    trunk/Build/source/texk/web2c/ptexdir/pdvitype.ch
    trunk/Build/source/texk/web2c/ptexdir/ppltotf.ch
    trunk/Build/source/texk/web2c/ptexdir/ptex.defines
    trunk/Build/source/texk/web2c/ptexdir/ptftopl.ch
    trunk/Build/source/texk/web2c/texmfmp-help.h
    trunk/Build/source/texk/web2c/uptexdir/ChangeLog
    trunk/Build/source/texk/web2c/uptexdir/kanji.c
    trunk/Build/source/texk/web2c/uptexdir/kanji.h
    trunk/Build/source/texk/web2c/uptexdir/uptex.defines

Modified: trunk/Build/source/texk/mendexk/ChangeLog
===================================================================
--- trunk/Build/source/texk/mendexk/ChangeLog	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/mendexk/ChangeLog	2018-06-14 03:29:59 UTC (rev 48012)
@@ -1,3 +1,7 @@
+2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* main.c: remove sjisterminal (w32 only).
+
 2018-05-15  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* README, main.c, configure.ac, configure:

Modified: trunk/Build/source/texk/mendexk/main.c
===================================================================
--- trunk/Build/source/texk/mendexk/main.c	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/mendexk/main.c	2018-06-14 03:29:59 UTC (rev 48012)
@@ -31,7 +31,6 @@
 
 #ifdef WIN32
 	_setmaxstdio(2048);
-	sjisterminal = 0;
 #endif
 	set_enc_string(NULL, "uptex");
 	kpse_set_program_name(argv[0], "mendex");
@@ -167,12 +166,6 @@
 				set_enc_string("SJIS", NULL);
 				break;
 
-#ifdef WIN32
-			case 'T':
-				sjisterminal = 1;
-				break;
-#endif
-
 			case 'U':
 				set_enc_string("UTF8", NULL);
 				break;

Modified: trunk/Build/source/texk/ptexenc/ChangeLog
===================================================================
--- trunk/Build/source/texk/ptexenc/ChangeLog	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/ptexenc/ChangeLog	2018-06-14 03:29:59 UTC (rev 48012)
@@ -1,3 +1,7 @@
+2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* ptexenc.c, ptexenc/ptexenc.h: remove sjisterminal (w32 only).
+
 2018-06-09  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* ptexenc.c, ptexenc/ptexenc.h: Add new functions

Modified: trunk/Build/source/texk/ptexenc/ptexenc/ptexenc.h
===================================================================
--- trunk/Build/source/texk/ptexenc/ptexenc/ptexenc.h	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/ptexenc/ptexenc/ptexenc.h	2018-06-14 03:29:59 UTC (rev 48012)
@@ -23,7 +23,6 @@
 
 extern PTENCDLL const char *ptexenc_version_string;
 #if defined(WIN32)
-extern PTENCDLL int sjisterminal;
 extern PTENCDLL FILE *Poptr;
 extern PTENCDLL int infile_enc_auto;
 #endif

Modified: trunk/Build/source/texk/ptexenc/ptexenc.c
===================================================================
--- trunk/Build/source/texk/ptexenc/ptexenc.c	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/ptexenc/ptexenc.c	2018-06-14 03:29:59 UTC (rev 48012)
@@ -39,7 +39,6 @@
 
 const char *ptexenc_version_string = PTEXENCVERSION;
 #if defined(WIN32)
-int sjisterminal;
 FILE *Poptr;
 int infile_enc_auto;
 #else
@@ -419,44 +418,38 @@
 
 static int put_multibyte(long c, FILE *fp) {
 #ifdef WIN32
-    if (sjisterminal) {
-        const int fd = fileno(fp);
+    const int fd = fileno(fp);
 
-        if ((fd == fileno(stdout) || fd == fileno(stderr)) && _isatty(fd)) {
-            HANDLE hStdout;
-            DWORD ret, wclen;
-            UINT cp;
-            wchar_t buff[2];
-            char str[4];
-            int mblen;
+    if ((fd == fileno(stdout) || fd == fileno(stderr)) && _isatty(fd)) {
+       HANDLE hStdout;
+       DWORD ret, wclen;
+       UINT cp;
+       wchar_t buff[2];
+       char str[4];
+       int mblen;
 
-            if (fd == fileno(stdout))
-                hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
-            else
-                hStdout = GetStdHandle(STD_ERROR_HANDLE);
+       if (fd == fileno(stdout))
+           hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
+       else
+           hStdout = GetStdHandle(STD_ERROR_HANDLE);
 
-            mblen=0;
-            if (BYTE1(c) != 0) str[mblen++]=BYTE1(c);
-            if (BYTE2(c) != 0) str[mblen++]=BYTE2(c);
-            if (BYTE3(c) != 0) str[mblen++]=BYTE3(c);
-            /* always */       str[mblen++]=BYTE4(c);
+       mblen=0;
+       if (BYTE1(c) != 0) str[mblen++]=BYTE1(c);
+       if (BYTE2(c) != 0) str[mblen++]=BYTE2(c);
+       if (BYTE3(c) != 0) str[mblen++]=BYTE3(c);
+       /* always */       str[mblen++]=BYTE4(c);
 
-#define CP_932     932
 #define CP_UTF8    65001
 
-            if (is_internalUPTEX())
-                cp = CP_UTF8;
-            else
-                cp = CP_932;
-            if (MultiByteToWideChar(cp, 0, str, mblen, buff, 2) == 0)
-                return EOF;
+       cp = CP_UTF8;
+       if (MultiByteToWideChar(cp, 0, str, mblen, buff, 2) == 0)
+           return EOF;
 
-            wclen = mblen > 3 ? 2 : 1;
-            if (WriteConsoleW(hStdout, buff, wclen, &ret, NULL) == 0)
-                return EOF;
+       wclen = mblen > 3 ? 2 : 1;
+       if (WriteConsoleW(hStdout, buff, wclen, &ret, NULL) == 0)
+           return EOF;
 
-            return BYTE4(c);
-        }
+       return BYTE4(c);
     }
 #endif
 
@@ -491,20 +484,15 @@
 
 #ifdef WIN32
     if ((fp == stdout || fp == stderr) && (_isatty(fd) || !prior_file_enc)) {
-        if (sjisterminal) {
-            if (is_internalUPTEX())
-                output_enc = ENC_UTF8;
-            else
-                output_enc = ENC_SJIS;
-        } else
+        output_enc = ENC_UTF8;
+     } else
+        output_enc = get_file_enc();
 #else
     if ((fp == stdout || fp == stderr) && !prior_file_enc) {
-#endif
-
         output_enc = get_terminal_enc();
     } else
         output_enc = get_file_enc();
-
+#endif
     if (num[fd] > 0) {        /* multi-byte char */
         if (is_internalUPTEX() && iskanji1(c)) { /* error */
             ret = flush(store[fd], num[fd], fp);

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ChangeLog	2018-06-14 03:29:59 UTC (rev 48012)
@@ -1,3 +1,7 @@
+2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* help.h, texmfmp-help.h: remove sjisterminal (w32 only).
+
 2018-06-08  Karl Berry  <karl at freefriends.org>
 
 	* bibtex.ch (142): also try opening subsidiary .aux files

Modified: trunk/Build/source/texk/web2c/help.h
===================================================================
--- trunk/Build/source/texk/web2c/help.h	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/help.h	2018-06-14 03:29:59 UTC (rev 48012)
@@ -333,9 +333,6 @@
     "",
     "-kanji=STRING          set Japanese encoding (STRING=euc|jis|sjis|utf8)",
     "-min-crossrefs=NUMBER  include item after NUMBER cross-refs; default 2",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-terse                 do not print progress reports",
     "-help                  display this help and exit",
     "-version               output version information and exit",
@@ -357,9 +354,6 @@
     "-output-level=NUMBER   verbosity level, from 0 to 4; default 4",
     "-page-start=PAGE-SPEC  start at PAGE-SPEC, for example `2' or `5.*.-2'",
     "-show-opcodes          show numeric opcodes (in decimal)",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-help                  display this help and exit",
     "-version               output version information and exit",
     NULL
@@ -423,9 +417,6 @@
     "  Default TFMFILE is basename of PLFILE extended with `.tfm'.",
     "",
     "-kanji=STRING          set Japanese encoding (STRING=euc|jis|sjis|utf8)",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-help                  print this message and exit.",
     "-verbose               output progress reports.",
     "-version               print version information and exit.",
@@ -444,9 +435,6 @@
     "                        either `octal' or `ascii'; default is ascii for",
     "                        letters and digits, octal for all else",
     "-kanji=STRING          set Japanese encoding (STRING=euc|jis|sjis|utf8)",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-help                  display this help and exit",
     "-verbose               display progress reports",
     "-version               output version information and exit",
@@ -504,9 +492,6 @@
     "-kanji=STRING          set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)",
     "-kanji-internal=STRING set Japanese internal encoding (STRING=euc|uptex)",
     "-min-crossrefs=NUMBER  include item after NUMBER cross-refs; default 2",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-terse                 do not print progress reports",
     "-help                  display this help and exit",
     "-version               output version information and exit",
@@ -528,9 +513,6 @@
     "-output-level=NUMBER   verbosity level, from 0 to 4; default 4",
     "-page-start=PAGE-SPEC  start at PAGE-SPEC, for example `2' or `5.*.-2'",
     "-show-opcodes          show numeric opcodes (in decimal)",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-help                  display this help and exit",
     "-version               output version information and exit",
     NULL
@@ -545,9 +527,6 @@
     "  Default TFMFILE is basename of PLFILE extended with `.tfm'.",
     "",
     "-kanji=STRING          set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-help                  print this message and exit.",
     "-verbose               output progress reports.",
     "-version               print version information and exit.",
@@ -566,9 +545,6 @@
     "                        either `octal' or `ascii'; default is ascii for",
     "                        letters and digits, octal for all else",
     "-kanji=STRING          set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)",
-#if defined(WIN32)
-    "-sjis-terminal         always output to stdout and stderr by CP932",
-#endif
     "-help                  display this help and exit",
     "-verbose               display progress reports",
     "-version               output version information and exit",

Modified: trunk/Build/source/texk/web2c/lib/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/lib/ChangeLog	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/lib/ChangeLog	2018-06-14 03:29:59 UTC (rev 48012)
@@ -1,3 +1,7 @@
+2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* texmfmp.c: remove sjisterminal (w32 only).
+
 2018-06-10  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* texmfmp.c: Allow non-ascii file names for pdfTeX

Modified: trunk/Build/source/texk/web2c/lib/texmfmp.c
===================================================================
--- trunk/Build/source/texk/web2c/lib/texmfmp.c	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/lib/texmfmp.c	2018-06-14 03:29:59 UTC (rev 48012)
@@ -1663,7 +1663,6 @@
 #endif /* TeX or MF */
 #if IS_pTeX
 #ifdef WIN32
-      { "sjis-terminal",             0, &sjisterminal, 1 },
       { "guess-input-enc",           0, &infile_enc_auto, 1 },
       { "no-guess-input-enc",        0, &infile_enc_auto, 0 },
 #endif

Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2018-06-14 03:29:59 UTC (rev 48012)
@@ -1,3 +1,8 @@
+2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* pbibtex.ch, pdvitype.ch, ppltotf.ch, ptftopl.ch,
+	kanji.h, kanji.c, ptex.defines: remove sjisterminal (w32 only).
+
 2018-05-06  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
 
 	* kanji.c: More strict check kanji token.

Modified: trunk/Build/source/texk/web2c/ptexdir/kanji.c
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/kanji.c	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/kanji.c	2018-06-14 03:29:59 UTC (rev 48012)
@@ -6,10 +6,6 @@
 #include "kanji.h"
 #define CS_TOKEN_FLAG   0xFFFF
 
-#if !defined(WIN32)
-int sjisterminal;
-#endif
-
 /* TOKEN */
 boolean check_kanji(integer c)
 {

Modified: trunk/Build/source/texk/web2c/ptexdir/kanji.h
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/kanji.h	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/kanji.h	2018-06-14 03:29:59 UTC (rev 48012)
@@ -24,10 +24,6 @@
 #endif
 #define notkanjicharseq not_kanji_char_seq
 
-#if !defined(WIN32)
-extern int sjisterminal;
-#endif
-
 /* functions */
 #define Hi(x) (((x) >> 8) & 0xff)
 #define Lo(x) ((x) & 0xff)

Modified: trunk/Build/source/texk/web2c/ptexdir/pbibtex.ch
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/pbibtex.ch	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/pbibtex.ch	2018-06-14 03:29:59 UTC (rev 48012)
@@ -550,16 +550,6 @@
 long_options[current_option].val := 0;
 incr (current_option);
 
-@ Shift-JIS terminal (the flag is ignored except for WIN32).
- at .-sjis-terminal@>
-
-@<Define the option...@> =
-long_options[current_option].name := 'sjis-terminal';
-long_options[current_option].has_arg := 0;
-long_options[current_option].flag := address_of (sjis_terminal);
-long_options[current_option].val := 1;
-incr (current_option);
-
 @ Kanji option.
 @.-kanji@>
 

Modified: trunk/Build/source/texk/web2c/ptexdir/pdvitype.ch
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/pdvitype.ch	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/pdvitype.ch	2018-06-14 03:29:59 UTC (rev 48012)
@@ -511,16 +511,6 @@
 @x
 @ An element with all zeros always ends the list.
 @y
-@ Shift-JIS terminal (the flag is ignored except for WIN32).
- at .-sjis-terminal@>
-
-@<Define the option...@> =
-long_options[current_option].name := 'sjis-terminal';
-long_options[current_option].has_arg := 0;
-long_options[current_option].flag := address_of (sjis_terminal);
-long_options[current_option].val := 1;
-incr (current_option);
-
 @ Decide kanji encode
 @.-kanji@>
 

Modified: trunk/Build/source/texk/web2c/ptexdir/ppltotf.ch
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ppltotf.ch	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/ppltotf.ch	2018-06-14 03:29:59 UTC (rev 48012)
@@ -345,16 +345,6 @@
 @x
 @ An element with all zeros always ends the list.
 @y
-@ Shift-JIS terminal (the flag is ignored except for WIN32).
- at .-sjis-terminal@>
-
-@<Define the option...@> =
-long_options[current_option].name := 'sjis-terminal';
-long_options[current_option].has_arg := 0;
-long_options[current_option].flag := address_of (sjis_terminal);
-long_options[current_option].val := 1;
-incr (current_option);
-
 @ Kanji option.
 @.-kanji@>
 

Modified: trunk/Build/source/texk/web2c/ptexdir/ptex.defines
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ptex.defines	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/ptex.defines	2018-06-14 03:29:59 UTC (rev 48012)
@@ -29,5 +29,3 @@
 @define function kcatcodekey ();
 
 @define procedure initkanji;
-
- at define var sjisterminal;

Modified: trunk/Build/source/texk/web2c/ptexdir/ptftopl.ch
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ptftopl.ch	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/ptexdir/ptftopl.ch	2018-06-14 03:29:59 UTC (rev 48012)
@@ -379,16 +379,6 @@
 @x
 @ An element with all zeros always ends the list.
 @y
-@ Shift-JIS terminal (the flag is ignored except for WIN32).
- at .-sjis-terminal@>
-
-@<Define the option...@> =
-long_options[current_option].name := 'sjis-terminal';
-long_options[current_option].has_arg := 0;
-long_options[current_option].flag := address_of (sjis_terminal);
-long_options[current_option].val := 1;
-incr (current_option);
-
 @ Kanji option.
 @.-kanji@>
 

Modified: trunk/Build/source/texk/web2c/texmfmp-help.h
===================================================================
--- trunk/Build/source/texk/web2c/texmfmp-help.h	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/texmfmp-help.h	2018-06-14 03:29:59 UTC (rev 48012)
@@ -124,9 +124,6 @@
     "-recorder               enable filename recorder",
     "[-no]-shell-escape      disable/enable \\write18{SHELL COMMAND}",
     "-shell-restricted       enable restricted \\write18",
-#if defined(WIN32)
-    "-sjis-terminal          always output to stdout and stderr by CP932",
-#endif
     "-src-specials           insert source specials into the DVI file",
     "-src-specials=WHERE     insert source specials in certain places of",
     "                          the DVI file. WHERE is a comma-separated value",
@@ -254,9 +251,6 @@
     "-recorder               enable filename recorder",
     "[-no]-shell-escape      disable/enable \\write18{SHELL COMMAND}",
     "-shell-restricted       enable restricted \\write18",
-#if defined(WIN32)
-    "-sjis-terminal          always output to stdout and stderr by CP932",
-#endif
     "-src-specials           insert source specials into the DVI file",
     "-src-specials=WHERE     insert source specials in certain places of",
     "                          the DVI file. WHERE is a comma-separated value",
@@ -523,9 +517,6 @@
     "-recorder               enable filename recorder",
     "[-no]-shell-escape      disable/enable \\write18{SHELL COMMAND}",
     "-shell-restricted       enable restricted \\write18",
-#if defined(WIN32)
-    "-sjis-terminal          always output to stdout and stderr by CP932",
-#endif
     "-src-specials           insert source specials into the DVI file",
     "-src-specials=WHERE     insert source specials in certain places of",
     "                          the DVI file. WHERE is a comma-separated value",
@@ -651,9 +642,6 @@
     "-recorder               enable filename recorder",
     "[-no]-shell-escape      disable/enable \\write18{SHELL COMMAND}",
     "-shell-restricted       enable restricted \\write18",
-#if defined(WIN32)
-    "-sjis-terminal          always output to stdout and stderr by CP932",
-#endif
     "-src-specials           insert source specials into the DVI file",
     "-src-specials=WHERE     insert source specials in certain places of",
     "                          the DVI file. WHERE is a comma-separated value",

Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2018-06-14 03:29:59 UTC (rev 48012)
@@ -1,3 +1,8 @@
+2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* ksnji.h, kanji.c, uptex.defines:
+	remove sjisterminal (w32 only).
+
 2018-02-25  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* uptex-m.ch, kanji.c:

Modified: trunk/Build/source/texk/web2c/uptexdir/kanji.c
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/kanji.c	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/uptexdir/kanji.c	2018-06-14 03:29:59 UTC (rev 48012)
@@ -11,10 +11,6 @@
 #define KCAT_KANJI     16
 #define KCAT_HANGUL    19
 
-#if !defined(WIN32)
-int sjisterminal;
-#endif
-
 /* TOKEN */
 boolean check_kanji (integer c)
 {

Modified: trunk/Build/source/texk/web2c/uptexdir/kanji.h
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/kanji.h	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/uptexdir/kanji.h	2018-06-14 03:29:59 UTC (rev 48012)
@@ -19,10 +19,6 @@
 #define not_kanji_char_seq(a,b) (1)
 #define notkanjicharseq not_kanji_char_seq
 
-#if !defined(WIN32)
-extern int sjisterminal;
-#endif
-
 /* functions */
 #define XXHi(x) BYTE1(x)
 #define XHi(x) BYTE2(x)

Modified: trunk/Build/source/texk/web2c/uptexdir/uptex.defines
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex.defines	2018-06-14 02:38:49 UTC (rev 48011)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex.defines	2018-06-14 03:29:59 UTC (rev 48012)
@@ -45,5 +45,3 @@
 @define procedure dumpkanji ();
 @define procedure initkanji;
 @define procedure undumpkanji ();
-
- at define var sjisterminal;



More information about the tex-live-commits mailing list