Просмотр исходного кода

ENH: a few more haiku fixes, stop the debugger from coming up for tests

Bill Hoffman 17 лет назад
Родитель
Сommit
67dc176ffa
3 измененных файлов с 7 добавлено и 1 удалено
  1. 2 0
      Source/kwsys/DynamicLoader.hxx.in
  2. 4 0
      Source/kwsys/ProcessUNIX.c
  3. 1 1
      Source/kwsys/testProcess.c

+ 2 - 0
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

+ 4 - 0
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

+ 1 - 1
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