From 4a985ab4153e6ba130b801d4cec60709b0a44e47 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 3 Feb 2014 08:23:45 +0000 Subject: web2c/mplibdir: Bug fix: Avoid to redefine Byte and Bytef from git-svn-id: svn://tug.org/texlive/trunk@32853 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/mplibdir/ChangeLog | 4 ++++ Build/source/texk/web2c/mplibdir/psout.w | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 4bfc0a88451..4eb076c39b2 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2014-02-03 Peter Breitenlohner + + * psout.w: Avoid to redefine Byte and Bytef from . + 2014-01-31 Peter Breitenlohner * mp.w: Do not declare zlibVersion, #include , etc. diff --git a/Build/source/texk/web2c/mplibdir/psout.w b/Build/source/texk/web2c/mplibdir/psout.w index d9c768b7735..0ab2945828c 100644 --- a/Build/source/texk/web2c/mplibdir/psout.w +++ b/Build/source/texk/web2c/mplibdir/psout.w @@ -1609,10 +1609,14 @@ void mp_read_psname_table (MP mp) { @* \[44c] Helper functions for Type1 fonts. +Avoid to redefine |Byte| and |Bytef| from ||. + @= typedef char char_entry; +#ifndef ZCONF_H typedef unsigned char Byte; typedef Byte Bytef; +#endif @ @= char_entry *char_ptr, *char_array; -- cgit v1.2.3