From 182179e989e69456c363d78c5eee543222564fd2 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Sun, 6 Jan 2013 22:36:53 +0100
Subject: [PATCH] Haiku no longer defines __BEOS__

Change-Id: I881521d84a31b6b1c68930f94acbcea88b5c1dea
---
 ProcessUNIX.c         | 4 ----
 SystemTools.cxx       | 2 +-
 testDynamicLoader.cxx | 2 +-
 testProcess.c         | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index 1992211..83838af 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -63,10 +63,6 @@ do.
 #include <dirent.h>    /* DIR, dirent */
 #include <ctype.h>     /* isspace */
 
-#ifdef __HAIKU__
-#undef __BEOS__
-#endif
-
 #if defined(__VMS)
 # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK
 #else
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 9925640..b8fa2df 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -157,7 +157,7 @@ public:
 #include <os/storage/Path.h>
 #endif
 
-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+#if defined(__BEOS__) && !defined(__ZETA__)
 #include <be/kernel/OS.h>
 #include <be/storage/Path.h>
 
diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx
index a7adbca..cbfb65b 100644
--- a/testDynamicLoader.cxx
+++ b/testDynamicLoader.cxx
@@ -15,7 +15,7 @@
 #include KWSYS_HEADER(ios/iostream)
 #include KWSYS_HEADER(stl/string)
 
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
 #include <be/kernel/OS.h>  /* disable_debugger() API. */
 #endif
 
diff --git a/testProcess.c b/testProcess.c
index ec561ea..269b84b 100644
--- a/testProcess.c
+++ b/testProcess.c
@@ -32,7 +32,7 @@
 # pragma warn -8060 /* possibly incorrect assignment */
 #endif
 
-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+#if defined(__BEOS__) && !defined(__ZETA__)
 /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
 # include <be/kernel/OS.h>
 static inline void testProcess_usleep(unsigned int msec)
-- 
GitLab