From 00c836e325a07419f5d855e2f275500a37cb27d2 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 2 Oct 2011 11:15:00 -0700 Subject: Merge vestigial vsnprintf determination from zutil.h to gzguts.h. This also moves some of the same from zconf.h to gzguts.h. A new function, gzflags(), was created to pass the compilation flags related to vsnprintf usage back to zlibCompileFlags() in zutil.c. In the process, various compiler configuration files were updated to include gzflags(), as well as the new gzgetc_() function added when the gzgetc() macro was introduced in a previous patch. --- as400/bndsrc | 3 ++- as400/zlib.inc | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'as400') diff --git a/as400/bndsrc b/as400/bndsrc index 06c3f43..dad2bc9 100644 --- a/as400/bndsrc +++ b/as400/bndsrc @@ -52,7 +52,6 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB') EXPORT SYMBOL("gzputs") EXPORT SYMBOL("gzgets") EXPORT SYMBOL("gzputc") - EXPORT SYMBOL("gzgetc") EXPORT SYMBOL("gzflush") EXPORT SYMBOL("gzseek") EXPORT SYMBOL("gzrewind") @@ -170,6 +169,8 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB') /********************************************************************/ EXPORT SYMBOL("gzclose_w") + EXPORT SYMBOL("gzgetc_") + EXPORT SYMBOL("gzflags") /********************************************************************/ /* *MODULE INFLATE ZLIB 01/02/01 00:15:09 */ diff --git a/as400/zlib.inc b/as400/zlib.inc index 71b0e56..41ff616 100644 --- a/as400/zlib.inc +++ b/as400/zlib.inc @@ -182,6 +182,17 @@ D buf 32767 options(*varsize) Read buffer D len 10i 0 value Buffer length * + D gzputc PR 10i 0 extproc('gzputc') + D file value like(gzFile) File pointer + D c 10I 0 value Character to write + * + D gzgetc_ PR 10i 0 extproc('gzgetc_') + D file value like(gzFile) File pointer + * + D gzungetc PR 10i 0 extproc('gzungetc') + D c 10I 0 value Character to push + D file value like(gzFile) File pointer + * D gzflush PR 10i 0 extproc('gzflush') D file value like(gzFile) File pointer D flush 10I 0 value Type of flush @@ -420,4 +431,6 @@ D strm like(z_stream) Expansion stream D arg 10I 0 value Error code * + D gzflags PR 10U 0 extproc('gzflags') + * /endif -- cgit v1.2.3-55-g6feb