summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/uptexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:18:21 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:18:21 +0000
commitbeb5cd01dc68de7225916fafbd1ff2bb0bb338e5 (patch)
tree091e93b5b1916812aa51f17e6582ecc468d1576e /Build/source/texk/web2c/uptexdir
parent7cb8554d1c7ba5a1c04a9a6016c0516c31ca5961 (diff)
(u)pTeX: Reduce TL vs W32TeX diffs
git-svn-id: svn://tug.org/texlive/trunk@30898 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/uptexdir')
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 894314a29c5..b08858d3921 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kanji.h: Avoid redefinition of KANJI.
+
2013-04-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* uptrip/uptrip.diffs: Update for TL 2013.
diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h
index a27b22f3c4b..8540869c5c7 100644
--- a/Build/source/texk/web2c/uptexdir/kanji.h
+++ b/Build/source/texk/web2c/uptexdir/kanji.h
@@ -11,7 +11,9 @@
#define setintone(w,a) ((w).cint1=(a))
#endif
+#ifndef KANJI
#define KANJI
+#endif
#if !defined(WIN32)
extern int sjisterminal;