diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-11 12:50:18 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-11 12:50:18 +0000 |
commit | 708653785a66d3aad8830021eae3e517b8b1a572 (patch) | |
tree | aabd037e4edd0a08d4daed692f74fa4987f6f112 | |
parent | b252209ad5c893c0751745ca44b0064d9ae6476c (diff) |
XeTeX: Adapt to zlib-1.2.6, gzeof() now behaves like feof().
git-svn-id: svn://tug.org/texlive/trunk@25364 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.ch | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog b/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog index dd069017719..522a6f5237f 100644 --- a/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog +++ b/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog @@ -1,5 +1,6 @@ 2010-09-27 Peter Breitenlohner <peb@mppmu.mpg.de> + Import zlib-1.2.6. * patch-01-LARGEFILE64_SOURCE: Removed. 2010-09-27 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index fbe2536760d..83c5b9385be 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,9 @@ +2012-02-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * xetex.ch: Adapt to zlib-1.2.6 (problem found by Akira). + From zlib-1.2.6/ChangeLog: Fix gzeof() to behave just like + feof() when read is not past end of file + 2011-09-01 Peter Breitenlohner <peb@mppmu.mpg.de> * XeTeX_ext.h: Do not #include "XeTeXOTMath.h". diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch index 562da5393b0..4923e9d4faa 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.ch +++ b/Build/source/texk/web2c/xetexdir/xetex.ch @@ -6939,12 +6939,9 @@ k:=biggest_lang+1; @z @x -undump_int(x); if (x<>69069)or feof(fmt_file) then goto bad_fmt @y -undump_int(x); -if (x<>69069) then goto bad_fmt; -if not w_eof(fmt_file) then goto bad_fmt +if (x<>69069)or w_eof(fmt_file) then goto bad_fmt @z @x |