From 8e3b6823f2b8a528686acbe458e1e45025a43cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 10 May 2008 14:53:02 +0000 Subject: [PATCH] Don't ue ioctl('ichr') for Haiku, we support select(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25424 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/libs/ncurses/ncurses/tty/lib_twait.c | 6 +++--- src/libs/ncurses/ncurses/tty/tty_update.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/ncurses/ncurses/tty/lib_twait.c b/src/libs/ncurses/ncurses/tty/lib_twait.c index 2a3b7e2ff1..7a7e29afd7 100644 --- a/src/libs/ncurses/ncurses/tty/lib_twait.c +++ b/src/libs/ncurses/ncurses/tty/lib_twait.c @@ -157,7 +157,7 @@ _nc_timed_wait(int mode, #if USE_FUNC_POLL struct pollfd fd_list[2]; struct pollfd *fds = fd_list; -#elif defined(__BEOS__) +#elif defined(__BEOS__) && !defined(__HAIKU__) #elif HAVE_SELECT static fd_set set; #endif @@ -258,7 +258,7 @@ _nc_timed_wait(int mode, #endif -#elif defined(__BEOS__) +#elif defined(__BEOS__) && !defined(__HAIKU__) /* * BeOS's select() is declared in socket.h, so the configure script does * not see it. That's just as well, since that function works only for @@ -424,7 +424,7 @@ _nc_timed_wait(int mode, result |= (1 << count); } } -#elif defined(__BEOS__) +#elif defined(__BEOS__) && !defined(__HAIKU__) result = 1; /* redundant, but simple */ #elif HAVE_SELECT if ((mode & 2) diff --git a/src/libs/ncurses/ncurses/tty/tty_update.c b/src/libs/ncurses/ncurses/tty/tty_update.c index 408ebe3be7..7969f72e90 100644 --- a/src/libs/ncurses/ncurses/tty/tty_update.c +++ b/src/libs/ncurses/ncurses/tty/tty_update.c @@ -298,7 +298,7 @@ check_pending(void) if (poll(fds, 1, 0) > 0) { have_pending = TRUE; } -#elif defined(__BEOS__) +#elif defined(__BEOS__) && !defined(__HAIKU__) /* * BeOS's select() is declared in socket.h, so the configure script does * not see it. That's just as well, since that function works only for