diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-22 18:05:13 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-22 18:05:13 (GMT) |
| commit | 67dc176ffaa8c813d6156f14ff07c4685769aef8 (patch) | |
| tree | 21f9a642074a2adcd9f23c12a985d7ca221e8b92 /Source | |
| parent | 43fe0d3978a81b74be42c0e975bdfe0092778b48 (diff) | |
| download | CMake-67dc176ffaa8c813d6156f14ff07c4685769aef8.zip CMake-67dc176ffaa8c813d6156f14ff07c4685769aef8.tar.gz CMake-67dc176ffaa8c813d6156f14ff07c4685769aef8.tar.bz2 | |
ENH: a few more haiku fixes, stop the debugger from coming up for tests
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/DynamicLoader.hxx.in | 2 | ||||
| -rw-r--r-- | Source/kwsys/ProcessUNIX.c | 4 | ||||
| -rw-r--r-- | Source/kwsys/testProcess.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Source/kwsys/DynamicLoader.hxx.in b/Source/kwsys/DynamicLoader.hxx.in index 3a03515..6ac30da 100644 --- a/Source/kwsys/DynamicLoader.hxx.in +++ b/Source/kwsys/DynamicLoader.hxx.in @@ -25,6 +25,8 @@ #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 #include <mach-o/dyld.h> #endif +#elif defined(__HAIKU__) + #include <os/kernel/image.h> #elif defined(__BEOS__) #include <be/kernel/image.h> #endif diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c index 32b4d9e..2f8914b 100644 --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c @@ -63,6 +63,10 @@ do. #include <dirent.h> /* DIR, dirent */ #include <ctype.h> /* isspace */ +#ifdef __HAIKU__ +#undef __BEOS__ +#endif + #if defined(KWSYS_C_HAS_PTRDIFF_T) && KWSYS_C_HAS_PTRDIFF_T typedef ptrdiff_t kwsysProcess_ptrdiff_t; #else diff --git a/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c index 9002035..5b2e148 100644 --- a/Source/kwsys/testProcess.c +++ b/Source/kwsys/testProcess.c @@ -87,7 +87,7 @@ int test4(int argc, const char* argv[]) #if defined(_WIN32) /* Avoid error diagnostic popups since we are crashing on purpose. */ SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); -#elif defined(__BEOS__) +#elif defined(__BEOS__) || defined(__HAIKU__) /* Avoid error diagnostic popups since we are crashing on purpose. */ disable_debugger(1); #endif |