aboutsummaryrefslogtreecommitdiff
path: root/zutil.h
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-10-02 11:15:00 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-10-02 11:15:00 -0700
commit00c836e325a07419f5d855e2f275500a37cb27d2 (patch)
tree1b4ef187059c19ee142f6c61952133b50a295136 /zutil.h
parent0956bd23dd070074ec572fd5557a74ff29797b2f (diff)
downloadzlib-00c836e325a07419f5d855e2f275500a37cb27d2.tar.gz
zlib-00c836e325a07419f5d855e2f275500a37cb27d2.tar.bz2
zlib-00c836e325a07419f5d855e2f275500a37cb27d2.zip
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.
Diffstat (limited to 'zutil.h')
-rw-r--r--zutil.h35
1 files changed, 0 insertions, 35 deletions
diff --git a/zutil.h b/zutil.h
index c199b20..86d64bc 100644
--- a/zutil.h
+++ b/zutil.h
@@ -177,41 +177,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
177 177
178 /* functions */ 178 /* functions */
179 179
180#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
181# ifndef HAVE_VSNPRINTF
182# define HAVE_VSNPRINTF
183# endif
184#endif
185#if defined(__CYGWIN__)
186# ifndef HAVE_VSNPRINTF
187# define HAVE_VSNPRINTF
188# endif
189#endif
190#ifndef HAVE_VSNPRINTF
191# ifdef MSDOS
192 /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
193 but for now we just assume it doesn't. */
194# define NO_vsnprintf
195# endif
196# ifdef __TURBOC__
197# define NO_vsnprintf
198# endif
199# ifdef WIN32
200 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
201# if !defined(vsnprintf) && !defined(NO_vsnprintf)
202# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
203# define vsnprintf _vsnprintf
204# endif
205# endif
206# endif
207# ifdef __SASC
208# define NO_vsnprintf
209# endif
210#endif
211#ifdef VMS
212# define NO_vsnprintf
213#endif
214
215#if defined(pyr) 180#if defined(pyr)
216# define NO_MEMCPY 181# define NO_MEMCPY
217#endif 182#endif