diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-02-03 16:27:08 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-02-03 16:27:08 (GMT) |
| commit | a1d7f82d6845a496eef7520936e07221b49eb70c (patch) | |
| tree | ff418565e1d9f77022d2e5cb594c7b51014a792d | |
| parent | 5b2b40d34b0129893ac2a99c3987a8867d33efa6 (diff) | |
| download | CMake-a1d7f82d6845a496eef7520936e07221b49eb70c.zip CMake-a1d7f82d6845a496eef7520936e07221b49eb70c.tar.gz CMake-a1d7f82d6845a496eef7520936e07221b49eb70c.tar.bz2 | |
ENH: fix dynamic loading on haiku
| -rw-r--r-- | Source/kwsys/DynamicLoader.cxx | 11 | ||||
| -rw-r--r-- | Source/kwsys/DynamicLoader.hxx.in | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Source/kwsys/DynamicLoader.cxx b/Source/kwsys/DynamicLoader.cxx index 9ca9146..ac02e1a 100644 --- a/Source/kwsys/DynamicLoader.cxx +++ b/Source/kwsys/DynamicLoader.cxx @@ -335,20 +335,13 @@ const char* DynamicLoader::LastError() #endif //_WIN32 // --------------------------------------------------------------- -// 4. Implementation for BeOS / Haiku -#if defined __BEOS__ || defined(__HAIKU__) +// 4. Implementation for BeOS +#if defined __BEOS__ #include <string.h> // for strerror() -#ifdef __BEOS__ #include <be/kernel/image.h> #include <be/support/Errors.h> -#endif - -#ifdef __HAIKU__ -#include <os/kernel/image.h> -#include <os/support/Errors.h> -#endif #define DYNAMICLOADER_DEFINED 1 diff --git a/Source/kwsys/DynamicLoader.hxx.in b/Source/kwsys/DynamicLoader.hxx.in index 148904a..3a03515 100644 --- a/Source/kwsys/DynamicLoader.hxx.in +++ b/Source/kwsys/DynamicLoader.hxx.in @@ -25,8 +25,6 @@ #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 @@ -69,8 +67,6 @@ public: #else typedef void* LibraryHandle; #endif -#elif defined(__HAIKU__) - typedef image_id LibraryHandle; #elif defined(__BEOS__) typedef image_id LibraryHandle; #else // POSIX |