From 190bcdd11d5e6d0ff307735398a36b7dabccfb53 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 16 Feb 2012 09:01:36 +0000 Subject: TeX & MF: Remove test for end-of-file after undump Drop requirement for zlib-1.2.6 or later git-svn-id: svn://tug.org/texlive/trunk@25408 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 3 --- Build/source/libs/zlib/ChangeLog | 4 ++++ Build/source/libs/zlib/ac/zlib.ac | 3 --- Build/source/texk/web2c/ChangeLog | 5 +++++ Build/source/texk/web2c/alephdir/ChangeLog | 4 ++++ Build/source/texk/web2c/alephdir/com16bit.ch | 6 ++---- Build/source/texk/web2c/mf.ch | 6 +++--- Build/source/texk/web2c/tex.ch | 6 ++---- Build/source/texk/web2c/texmfmp.h | 1 - Build/source/texk/web2c/xetexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/xetexdir/xetex.ch | 6 ------ Build/source/texk/web2c/xetexdir/xetex.defines | 1 - 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Build/source/configure b/Build/source/configure index 4a103131784..0776bd842ae 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -20144,9 +20144,6 @@ main () { z_stream stream; const char *version = zlibVersion(); -#if ZLIB_VERNUM < 0x1260 - choke me -#endif deflate(&stream, 0); ; return 0; diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index de97098b779..161481c1ca9 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,3 +1,7 @@ +2012-02-16 Peter Breitenlohner + + * ac/zlib.ac: Drop requirement for zlib-1.2.6 or later. + 2012-02-13 Peter Breitenlohner * ac/zlib.ac: Require zlib-1.2.6 or later (for XeTeX). diff --git a/Build/source/libs/zlib/ac/zlib.ac b/Build/source/libs/zlib/ac/zlib.ac index c2dcd5593a0..3e9b15ded16 100644 --- a/Build/source/libs/zlib/ac/zlib.ac +++ b/Build/source/libs/zlib/ac/zlib.ac @@ -8,7 +8,4 @@ KPSE_TRY_LIB([zlib], [#include ], [z_stream stream; const char *version = zlibVersion(); -#if ZLIB_VERNUM < 0x1260 - choke me -#endif deflate(&stream, 0);]) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index ec152440393..959c98ebfd5 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2012-02-16 Peter Breitenlohner + + * mf.ch, tex.ch: Remove test for end-of-file after undump. + * texmfmp.h: Remove weof(). + 2012-02-12 Akira Kakuto * texmfmp.h: Remove old comments that gzFile is typedef'd as void *. diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index b80ca2674bc..db524ba81d3 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,7 @@ +2012-02-16 Peter Breitenlohner + + * com16bit.ch: Remove test for end-of-file after undump. + 2012-02-01 Peter Breitenlohner * com16bit.ch: Ensure dvi file size < 2GB. diff --git a/Build/source/texk/web2c/alephdir/com16bit.ch b/Build/source/texk/web2c/alephdir/com16bit.ch index e3e39c70718..f4318eac363 100644 --- a/Build/source/texk/web2c/alephdir/com16bit.ch +++ b/Build/source/texk/web2c/alephdir/com16bit.ch @@ -2415,12 +2415,10 @@ undump(batch_mode)(error_stop_mode)(interaction); if interaction_option<>unspecified_mode then interaction:=interaction_option; @z -% [50.1327] As with TFM files, `eof' here means `have we previously -% encountered the end-of-file', not `are we at the end of the file'. -@x [50.1327] l.24120 - dumping/undumping, replace eof() by feof() +@x [50.1327] l.24172 - Test for end-of-file already done by undump. if (x<>69069)or eof(fmt_file) then goto bad_fmt @y -if (x<>69069)or feof(fmt_file) then goto bad_fmt +if x<>69069 then goto bad_fmt @z @x [50.1328] l.24124 - Eliminate probably wrong word `preloaded' from format_idents. diff --git a/Build/source/texk/web2c/mf.ch b/Build/source/texk/web2c/mf.ch index f2b9a6d61a0..ebfe2a3d78b 100644 --- a/Build/source/texk/web2c/mf.ch +++ b/Build/source/texk/web2c/mf.ch @@ -2106,17 +2106,17 @@ if mem_min+1100>mem_top then goto off_base; mem:=xmalloc_array (memory_word, mem_max - mem_min + 1); @z -@x [48.1199] l.22725 - - Allow command line to override dumped value. +@x [48.1199] l.22750 - Allow command line to override dumped value. undump(batch_mode)(error_stop_mode)(interaction); @y undump(batch_mode)(error_stop_mode)(interaction); if interaction_option<>unspecified_mode then interaction:=interaction_option; @z -@x [48.1199] eof is like C feof here. +@x [48.1199] l.22755 - Test for end-of-file already done by undump. undump_int(x);@+if (x<>69069)or eof(base_file) then goto off_base @y -undump_int(x);@+if (x<>69069)or feof(base_file) then goto off_base +undump_int(x);@+if x<>69069 then goto off_base @z @x [48.1200] Eliminate probably-wrong word `preloaded' from base_idents. diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch index b4a05724fac..03ffaa02520 100644 --- a/Build/source/texk/web2c/tex.ch +++ b/Build/source/texk/web2c/tex.ch @@ -4098,12 +4098,10 @@ undump(batch_mode)(error_stop_mode)(interaction); if interaction_option<>unspecified_mode then interaction:=interaction_option; @z -% [50.1327] As with TFM files, `eof' here means `have we previously -% encountered the end-of-file', not `are we at the end of the file'. -@x [50.1327] l.24120 - dumping/undumping, replace eof() by feof() +@x [50.1327] l.24172 - Test for end-of-file already done by undump. if (x<>69069)or eof(fmt_file) then goto bad_fmt @y -if (x<>69069)or feof(fmt_file) then goto bad_fmt +if x<>69069 then goto bad_fmt @z % Eliminate probably wrong word `preloaded' from format_idents. diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h index 922d96a0a67..c580374f15b 100644 --- a/Build/source/texk/web2c/texmfmp.h +++ b/Build/source/texk/web2c/texmfmp.h @@ -245,7 +245,6 @@ extern void topenin (void); && (f = gzdopen(fileno((FILE*)f), FOPEN_WBIN_MODE)) \ && (gzsetparams(f, 1, Z_DEFAULT_STRATEGY) == Z_OK)) #define wclose(f) gzclose(f) -#define weof(f) gzeof(f) #else #define wopenin(f) open_input (&(f), DUMP_FORMAT, FOPEN_RBIN_MODE) #define wopenout bopenout diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 1786d4cb5e8..ed40dedab31 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-02-16 Peter Breitenlohner + + * xetex.ch: Remove test for end-of-file after undump. + * xetex.defines: Remove weof(). + 2012-02-11 Jonathan Kew * XeTeX_ext.c (makefontdef): pass font pathname to xdvipdfmx diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch index 0eaaa9cdfa4..551edaa9043 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.ch +++ b/Build/source/texk/web2c/xetexdir/xetex.ch @@ -6938,12 +6938,6 @@ init for k:=0 to biggest_lang do trie_used[k]:=min_quarterword;@+tini@;@/ k:=biggest_lang+1; @z -@x -if (x<>69069)or feof(fmt_file) then goto bad_fmt -@y -if (x<>69069)or w_eof(fmt_file) then goto bad_fmt -@z - @x @* \[51] The main program. @y diff --git a/Build/source/texk/web2c/xetexdir/xetex.defines b/Build/source/texk/web2c/xetexdir/xetex.defines index c898223597e..2c1a3b4b9a3 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.defines +++ b/Build/source/texk/web2c/xetexdir/xetex.defines @@ -66,7 +66,6 @@ authorization from the copyright holders. @define procedure terminatefontmanager; @define function initpool(); @define type gzFile; -@define function weof(); @define procedure checkfortfmfontmapping; @define function loadtfmfontmapping; @define function applytfmfontmapping(); -- cgit v1.2.3