diff options
author | Adrien Destugues <pulkomandy@pulkomandy.tk> | 2013-10-05 14:33:52 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-10-08 13:55:55 (GMT) |
commit | 38d555537c4b9a09fdbc2909d014e50172bd51ce (patch) | |
tree | 56e1555ae93b16ea416723fe43b1f0a0a92ea53e /Utilities/cmcurl | |
parent | 1dc61f814277744581bb36ae40c91893c1bef851 (diff) | |
download | CMake-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/cmcurl')
-rw-r--r-- | Utilities/cmcurl/CMake/CurlTests.c | 2 | ||||
-rw-r--r-- | Utilities/cmcurl/select.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c index d74a4f0..c5ba7c2 100644 --- a/Utilities/cmcurl/CMake/CurlTests.c +++ b/Utilities/cmcurl/CMake/CurlTests.c @@ -38,7 +38,7 @@ main () # define PLATFORM_AIX_V3 #endif -#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) +#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) #error "O_NONBLOCK does not work on this platform" #endif int socket; diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c index 51adbcf..82f9dc2 100644 --- a/Utilities/cmcurl/select.c +++ b/Utilities/cmcurl/select.c @@ -39,7 +39,7 @@ #error "We can't compile without select() support!" #endif -#if defined(__BEOS__) && !defined(__HAIKU__) +#if defined(__BEOS__) /* BeOS has FD_SET defined in socket.h */ #include <socket.h> #endif |