Commits

Anonymous committed 7b2725f

ENH: merge in a few more changes for RC 11

Comments (0)

Files changed (2)

GCC_XML/KWSys/DynamicLoader.cxx

 #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
 

GCC_XML/KWSys/DynamicLoader.hxx.in

   #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
   #else
     typedef void* LibraryHandle;
   #endif
-#elif defined(__HAIKU__)
-  typedef image_id LibraryHandle;
 #elif defined(__BEOS__)
   typedef image_id LibraryHandle;
 #else  // POSIX