summaryrefslogtreecommitdiffstats
path: root/Utilities/cmzlib/zutil.h
diff options
context:
space:
mode:
Diffstat (limited to 'Utilities/cmzlib/zutil.h')
-rw-r--r--Utilities/cmzlib/zutil.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h
index b7d5eff..74ef1f8 100644
--- a/Utilities/cmzlib/zutil.h
+++ b/Utilities/cmzlib/zutil.h
@@ -147,7 +147,13 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# define OS_CODE 0x0f
#endif
-#if defined(_BEOS_) || defined(RISCOS)
+/* 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