kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix dynamic loading on haiku

This commit is contained in:
Bill Hoffman 2009-02-03 11:27:08 -05:00
parent 5b2b40d34b
commit a1d7f82d68
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/kwsys/DynamicLoader.cxx
View File

@ -335,20 +335,13 @@ const char* DynamicLoader::LastError()
#endif //_WIN32 #endif //_WIN32
// --------------------------------------------------------------- // ---------------------------------------------------------------
// 4. Implementation for BeOS / Haiku // 4. Implementation for BeOS
#if defined __BEOS__ || defined(__HAIKU__) #if defined __BEOS__
#include <string.h> // for strerror() #include <string.h> // for strerror()
#ifdef __BEOS__
#include <be/kernel/image.h> #include <be/kernel/image.h>
#include <be/support/Errors.h> #include <be/support/Errors.h>
#endif
#ifdef __HAIKU__
#include <os/kernel/image.h>
#include <os/support/Errors.h>
#endif
#define DYNAMICLOADER_DEFINED 1 #define DYNAMICLOADER_DEFINED 1

4
Source/kwsys/DynamicLoader.hxx.in
View File

@ -25,8 +25,6 @@
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#endif #endif
#elif defined(__HAIKU__)
#include <os/kernel/image.h>
#elif defined(__BEOS__) #elif defined(__BEOS__)
#include <be/kernel/image.h> #include <be/kernel/image.h>
#endif #endif
@ -69,8 +67,6 @@ public:
#else #else
typedef void* LibraryHandle; typedef void* LibraryHandle;
#endif #endif
#elif defined(__HAIKU__)
typedef image_id LibraryHandle;
#elif defined(__BEOS__) #elif defined(__BEOS__)
typedef image_id LibraryHandle; typedef image_id LibraryHandle;
#else // POSIX #else // POSIX