diff options
Diffstat (limited to 'src/3rdparty/zlib')
| -rw-r--r-- | src/3rdparty/zlib/minigzip.c | 3 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zconf.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zconf.in.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zutil.h | 8 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/3rdparty/zlib/minigzip.c b/src/3rdparty/zlib/minigzip.c index 6de35dde9..ed1d1486d 100644 --- a/src/3rdparty/zlib/minigzip.c +++ b/src/3rdparty/zlib/minigzip.c @@ -48,9 +48,6 @@ # define GZ_SUFFIX "-gz" # define fileno(file) file->__file #endif -#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include <unix.h> /* for fileno */ -#endif #ifndef WIN32 /* unlink already in stdio.h for WIN32 */ extern int unlink OF((const char *)); diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index af321ab6f..7b4d7a0d5 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -120,7 +120,7 @@ #endif /* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +#if defined(applec)||defined(THINK_C)||defined(__SC__) # define NO_DUMMY_DECL #endif diff --git a/src/3rdparty/zlib/zconf.in.h b/src/3rdparty/zlib/zconf.in.h index af321ab6f..7b4d7a0d5 100644 --- a/src/3rdparty/zlib/zconf.in.h +++ b/src/3rdparty/zlib/zconf.in.h @@ -120,7 +120,7 @@ #endif /* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +#if defined(applec)||defined(THINK_C)||defined(__SC__) # define NO_DUMMY_DECL #endif diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h index 50bcbbf6e..e673e7244 100644 --- a/src/3rdparty/zlib/zutil.h +++ b/src/3rdparty/zlib/zutil.h @@ -99,12 +99,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #if defined(MACOS) || defined(TARGET_OS_MAC) # define OS_CODE 0x07 -# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include <unix.h> /* for fdopen */ -# else -# ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ -# endif +# ifndef fdopen +# define fdopen(fd,mode) NULL /* No fdopen() */ # endif #endif |
