summaryrefslogtreecommitdiffstats
path: root/Utilities/cmzlib
diff options
context:
space:
mode:
authorAdrien Destugues <pulkomandy@pulkomandy.tk>2013-10-05 14:33:52 (GMT)
committerBrad King <brad.king@kitware.com>2013-10-08 13:55:55 (GMT)
commit38d555537c4b9a09fdbc2909d014e50172bd51ce (patch)
tree56e1555ae93b16ea416723fe43b1f0a0a92ea53e /Utilities/cmzlib
parent1dc61f814277744581bb36ae40c91893c1bef851 (diff)
downloadCMake-38d555537c4b9a09fdbc2909d014e50172bd51ce.zip
CMake-38d555537c4b9a09fdbc2909d014e50172bd51ce.tar.gz
CMake-38d555537c4b9a09fdbc2909d014e50172bd51ce.tar.bz2
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.h2
-rw-r--r--Utilities/cmzlib/zutil.h6
2 files changed, 1 insertions, 7 deletions
diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h
index 6eb52d1..7a3b6fd 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 74ef1f8..3053cd8 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