diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:21:57 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:21:57 -0700 |
| commit | 13a294f044ef0a89b2dcbfbb5d4d4c792673348e (patch) | |
| tree | d9b377b4d8c00633c3da4e96659bfba9b08287f2 /zconf.h | |
| parent | 7c2a874e50b871d04fbd19501f7b42cff55e5abc (diff) | |
| download | zlib-13a294f044ef0a89b2dcbfbb5d4d4c792673348e.tar.gz | |
zlib 1.2.0.1v1.2.0.1
Diffstat (limited to 'zconf.h')
| -rw-r--r-- | zconf.h | 31 |
1 files changed, 22 insertions, 9 deletions
@@ -91,7 +91,7 @@ #ifndef STDC # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ -# define const /* note: need a more gentle solution here */ +# define const /* note: need a more gentle solution here */ # endif #endif @@ -101,7 +101,10 @@ #endif /* Old Borland C incorrectly complains about missing returns: */ -#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500) +#if defined(__BORLANDC__) && (__BORLANDC__ < 0x460) +# define NEED_DUMMY_RETURN +#endif +#if defined(__TURBOC__) && !defined(__BORLANDC__) # define NEED_DUMMY_RETURN #endif @@ -169,17 +172,24 @@ # endif #endif +#if defined(WIN32) && (!defined(ZLIB_WIN32_NODLL)) && (!defined(ZLIB_DLL)) +# define ZLIB_DLL +#endif + /* Compile with -DZLIB_DLL for Windows DLL support */ #if defined(ZLIB_DLL) -# if defined(_WINDOWS) || defined(WINDOWS) -# ifdef FAR -# undef FAR +# if defined(_WINDOWS) || defined(WINDOWS) || defined(WIN32) +# ifndef WINAPIV +# ifdef FAR +# undef FAR +# endif +# include <windows.h> # endif -# include <windows.h> -# define ZEXPORT WINAPI # ifdef WIN32 +# define ZEXPORT WINAPI # define ZEXPORTVA WINAPIV # else +# define ZEXPORT WINAPI _export # define ZEXPORTVA FAR _cdecl _export # endif # endif @@ -187,7 +197,7 @@ # if (__BORLANDC__ >= 0x0500) && defined (WIN32) # include <windows.h> # define ZEXPORT __declspec(dllexport) WINAPI -# define ZEXPORTRVA __declspec(dllexport) WINAPIV +# define ZEXPORTVA __declspec(dllexport) WINAPIV # else # if defined (_Windows) && defined (__DLL__) # define ZEXPORT _export @@ -246,9 +256,12 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ +#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ # include <sys/types.h> /* for off_t */ # include <unistd.h> /* for SEEK_* and off_t */ +# ifdef VMS +# include <unixio.h> /* for off_t */ +# endif # define z_off_t off_t #endif #ifndef SEEK_SET |