diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-15 21:53:28 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-15 21:53:28 (GMT) |
| commit | 64fc597de292228b244a3ab18a33bcd8488e09d6 (patch) | |
| tree | 17910ce2705e14c5428fdc4b1365b5c025867c58 /Utilities/cmzlib | |
| parent | f49f1d2973039b6e706326d763950c2ecd1d3153 (diff) | |
| download | CMake-64fc597de292228b244a3ab18a33bcd8488e09d6.zip CMake-64fc597de292228b244a3ab18a33bcd8488e09d6.tar.gz CMake-64fc597de292228b244a3ab18a33bcd8488e09d6.tar.bz2 | |
ENH: add initial support for HAIKU OS from bug# 7425
Diffstat (limited to 'Utilities/cmzlib')
| -rw-r--r-- | Utilities/cmzlib/zconf.h | 2 | ||||
| -rw-r--r-- | Utilities/cmzlib/zutil.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 7a3b6fd..6eb52d1 100644 --- a/Utilities/cmzlib/zconf.h +++ b/Utilities/cmzlib/zconf.h @@ -237,7 +237,7 @@ # endif #endif -#if defined (__BEOS__) +#if defined (__BEOS__) && !defined (__HAIKU__) # ifdef ZLIB_DLL # ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) 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 |