diff options
Diffstat (limited to 'Build/source/texk/web2c/uptexdir')
-rw-r--r-- | Build/source/texk/web2c/uptexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/kanji.h | 2 |
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; |