diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-03-30 16:38:46 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-03-30 19:15:08 +0200 |
| commit | 28385368ddc6ef50e444d53e873be667f467303a (patch) | |
| tree | b5973c1f1b94555855f1268f1ae46e6672d65cf2 /lib/zlib/zconf.h | |
| parent | 9ed7b1235c5acebd34ab7a0ae40e89e22078817b (diff) | |
Update built-in zlib version
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/zlib/zconf.h')
| -rw-r--r-- | lib/zlib/zconf.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/lib/zlib/zconf.h b/lib/zlib/zconf.h index 427add2..fbdf0e3 100644 --- a/lib/zlib/zconf.h +++ b/lib/zlib/zconf.h @@ -301,12 +301,38 @@ # endif #endif +/* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ +#ifdef SYS16BIT +# if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ +# define SMALL_MEDIUM +# ifdef _MSC_VER +# define FAR _far +# else +# define FAR far +# endif +# endif +# if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ +# define SMALL_MEDIUM +# ifdef __BORLANDC__ +# define FAR _far +# else +# define FAR far +# endif +# endif +#endif + /* XXX: Not original zlib source code. The definitions of ZEXTERN, ZEXPORT and ZEXPORTVA were removed and replaced with the following below by David Oberhollenzer for use in in libsquashfs. */ - #ifndef ZEXTERN # if (defined(__GNUC__) || defined(__clang__)) && !defined(_WIN32) # define ZEXTERN __attribute__ ((visibility ("hidden"))) @@ -320,6 +346,7 @@ #ifndef ZEXPORTVA # define ZEXPORTVA #endif + #ifndef FAR # define FAR #endif |