From beb5cd01dc68de7225916fafbd1ff2bb0bb338e5 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 24 Jun 2013 11:18:21 +0000 Subject: (u)pTeX: Reduce TL vs W32TeX diffs git-svn-id: svn://tug.org/texlive/trunk@30898 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/uptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/uptexdir/kanji.h | 2 ++ 2 files changed, 6 insertions(+) (limited to 'Build/source/texk/web2c/uptexdir') 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 + + * kanji.h: Avoid redefinition of KANJI. + 2013-04-09 Peter Breitenlohner * 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; -- cgit v1.2.3