From e6f011edbe53ac3f49b362eee5fcc4d0d12271c8 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 26 Apr 2008 00:57:12 +0000
Subject: [PATCH] Disabled BeOS work-arounds for Haiku.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25170 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/bin/bash/execute_cmd.c | 2 +-
 src/bin/bash/general.c     | 2 +-
 src/bin/bash/sig.c         | 2 +-
 src/bin/bash/trap.c        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/bash/execute_cmd.c b/src/bin/bash/execute_cmd.c
index 5d110f17ec..c8c2566c20 100644
--- a/src/bin/bash/execute_cmd.c
+++ b/src/bin/bash/execute_cmd.c
@@ -3137,7 +3137,7 @@ execute_builtin_or_function (words, builtin, var, redirects,
 void
 setup_async_signals ()
 {
-#if defined (__BEOS__)
+#if defined (__BEOS__) && !defined (__HAIKU__)
   set_signal_handler (SIGHUP, SIG_IGN);	/* they want csh-like behavior */
 #endif
 
diff --git a/src/bin/bash/general.c b/src/bin/bash/general.c
index 446e42f449..7bd4bad531 100644
--- a/src/bin/bash/general.c
+++ b/src/bin/bash/general.c
@@ -335,7 +335,7 @@ sh_validfd (fd)
 /* There is a bug in the NeXT 2.1 rlogind that causes opens
    of /dev/tty to fail. */
 
-#if defined (__BEOS__)
+#if defined (__BEOS__) && !defined (__HAIKU__)
 /* On BeOS, opening in non-blocking mode exposes a bug in BeOS, so turn it
    into a no-op.  This should probably go away in the future. */
 #  undef O_NONBLOCK
diff --git a/src/bin/bash/sig.c b/src/bin/bash/sig.c
index 714c138f4d..ec2b28f532 100644
--- a/src/bin/bash/sig.c
+++ b/src/bin/bash/sig.c
@@ -446,7 +446,7 @@ sigint_sighandler (sig)
   if (interrupt_immediately)
     {
       interrupt_immediately = 0;
-#ifdef __BEOS__
+#if defined (__BEOS__) && !defined (__HAIKU__)
       /* XXXdbg -- throw_to_top_level() calls longjmp() which leaves our
 	 sigmask in a screwed up state so we reset it here. */
       /* FIXME - fnf: Is this a generic problem with bash, or something
diff --git a/src/bin/bash/trap.c b/src/bin/bash/trap.c
index c40baf81ba..606797b1e4 100644
--- a/src/bin/bash/trap.c
+++ b/src/bin/bash/trap.c
@@ -140,7 +140,7 @@ initialize_traps ()
   set_signal_handler (SIGINT, original_signals[SIGINT]);
   sigmodes[SIGINT] |= SIG_SPECIAL;
 
-#if defined (__BEOS__)
+#if defined (__BEOS__) && !defined (__HAIKU__)
   /* BeOS sets SIGINT to SIG_IGN! */
   original_signals[SIGINT] = SIG_DFL;
 #endif