diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2013-01-07 21:20:11 +0100 |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2013-01-07 21:20:11 +0100 |
| commit | 7a1b961de8b79416d168355e71f5af80fa4dbd02 (patch) | |
| tree | f61e180629217580ac23c73fba4ff9887521a5d1 | |
| parent | ed96d9a605471694465dd7142dd25748dfdf3a90 (diff) | |
| download | cmake-7a1b961de8b79416d168355e71f5af80fa4dbd02.tar.gz | |
Haiku no longer defines __BEOS__
| -rw-r--r-- | Modules/CheckForPthreads.c | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGeneratorFactory.cxx | 4 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c index 882dc21b7b..7250fbff63 100644 --- a/Modules/CheckForPthreads.c +++ b/Modules/CheckForPthreads.c @@ -16,7 +16,7 @@ int main(int ac, char*av[]){ pthread_create(&tid[0], 0, runner, (void*)1); pthread_create(&tid[1], 0, runner, (void*)2); -#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) +#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) usleep(1); // for strange behavior on single-processor sun #endif diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 5577673912..b36c2a2f82 100644 --- a/Source/CPack/cmCPackGeneratorFactory.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -33,7 +33,7 @@ #endif #if !defined(_WIN32) \ - && !defined(__QNXNTO__) && !defined(__BEOS__) + && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) # include "cmCPackDebGenerator.h" # include "cmCPackRPMGenerator.h" #endif @@ -126,7 +126,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() } #endif #if !defined(_WIN32) \ - && !defined(__QNXNTO__) && !defined(__BEOS__) + && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) if (cmCPackDebGenerator::CanGenerate()) { this->RegisterGenerator("DEB", "Debian packages", diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index bb6f3f29dc..322a6a26f1 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -53,7 +53,7 @@ #include <cm_zlib.h> #include <cmsys/Base64.h> -#if defined(__BEOS__) && !defined(__HAIKU__) +#if defined(__BEOS__) #include <be/kernel/OS.h> /* disable_debugger() API. */ #endif |