diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:19:21 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:19:21 -0700 |
| commit | b8c9ecb0765fc39423c07613d909c5193378bdfd (patch) | |
| tree | c2a2964d00dcfee6c7426ffcdf8e8060727bc2bf /zconf.h | |
| parent | 6759211ad8a5006689216a86c3267bb503bfccc1 (diff) | |
| download | zlib-b8c9ecb0765fc39423c07613d909c5193378bdfd.tar.gz | |
zlib 1.0.9v1.0.9
Diffstat (limited to 'zconf.h')
| -rw-r--r-- | zconf.h | 44 |
1 files changed, 24 insertions, 20 deletions
@@ -30,6 +30,7 @@ # define inflateSyncPoint z_inflateSyncPoint # define inflateReset z_inflateReset # define compress z_compress +# define compress2 z_compress2 # define uncompress z_uncompress # define adler32 z_adler32 # define crc32 z_crc32 @@ -158,6 +159,29 @@ # define FAR __far # endif #endif + +/* Compile with -DZLIB_DLL for Windows DLL support */ +#if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL) +# ifdef FAR +# undef FAR +# endif +# include <windows.h> +# define ZEXPORT WINAPI +# ifdef WIN32 +# define ZEXPORTVA WINAPIV +# else +# define ZEXPORTVA FAR _cdecl _export +# endif +#else +# if defined (__BORLANDC__) && defined (_Windows) && defined (__DLL__) +# define ZEXPORT _export +# define ZEXPORTVA _export +# else +# define ZEXPORT +# define ZEXPORTVA +# endif +#endif + #ifndef FAR # define FAR #endif @@ -198,26 +222,6 @@ typedef uLong FAR uLongf; # define z_off_t long #endif -/* Compile with -DZLIB_DLL for Windows DLL support */ -#if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL) -# undef FAR -# include <windows.h> -# define EXPORT WINAPI -# ifdef WIN32 -# define EXPORTVA WINAPIV -# else -# define EXPORTVA FAR _cdecl _export -# endif -#else -# if defined (__BORLANDC__) && defined (_Windows) && defined (__DLL__) -# define EXPORT _export -# define EXPORTVA _export -# else -# define EXPORT -# define EXPORTVA -# endif -#endif - /* MVS linker does not support external names larger than 8 bytes */ #if defined(__MVS__) # pragma map(deflateInit_,"DEIN") |