diff options
-rw-r--r-- | Build/source/texk/web2c/mplibdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/mplibdir/psout.w | 4 |
2 files changed, 8 insertions, 0 deletions
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 <peb@mppmu.mpg.de> + + * psout.w: Avoid to redefine Byte and Bytef from <zlib.h>. + 2014-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> * mp.w: Do not declare zlibVersion, #include <zlib.h>, 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 |<zlib.h>|. + @<Types...@>= typedef char char_entry; +#ifndef ZCONF_H typedef unsigned char Byte; typedef Byte Bytef; +#endif @ @<Glob...@>= char_entry *char_ptr, *char_array; |