diff options
| author | Adrien Destugues <pulkomandy@pulkomandy.tk> | 2013-10-05 16:33:52 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-08 09:55:55 -0400 |
| commit | 38d555537c4b9a09fdbc2909d014e50172bd51ce (patch) | |
| tree | 56e1555ae93b16ea416723fe43b1f0a0a92ea53e /Utilities/cmzlib | |
| parent | 1dc61f814277744581bb36ae40c91893c1bef851 (diff) | |
| download | cmake-38d555537c4b9a09fdbc2909d014e50172bd51ce.tar.gz | |
Haiku: Remove outdated preprocessor checks
* Haiku does not define __BEOS__ anymore, so there is no need to guard
these BeOS specific workaround for Haiku.
* The workaround themselves are not needed for Haiku as it has much
better POSIX compatibility than BeOS did.
Applied-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'Utilities/cmzlib')
| -rw-r--r-- | Utilities/cmzlib/zconf.h | 2 | ||||
| -rw-r--r-- | Utilities/cmzlib/zutil.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 6eb52d1334..7a3b6fdc1f 100644 --- a/Utilities/cmzlib/zconf.h +++ b/Utilities/cmzlib/zconf.h @@ -237,7 +237,7 @@ # endif #endif -#if defined (__BEOS__) && !defined (__HAIKU__) +#if defined (__BEOS__) # ifdef ZLIB_DLL # ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h index 74ef1f89fd..3053cd8eea 100644 --- a/Utilities/cmzlib/zutil.h +++ b/Utilities/cmzlib/zutil.h @@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define OS_CODE 0x0f #endif -/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -/* many BeOS workarounds are no longer needed in Haiku */ -#if defined(__HAIKU__) && defined(__BEOS__) -#undef __BEOS__ -#endif - #if defined(_BEOS_) || defined(RISCOS) # define fdopen(fd,mode) NULL /* No fdopen() */ #endif |