From 7d3f2fc424d30975b03018ff3effa7b3d26cf7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 9 Feb 2005 21:52:20 +0000 Subject: [PATCH] haiku build git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11303 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/input_server/devices/keyboard/Jamfile | 3 ++- .../input_server/devices/keyboard/TMWindow.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile index a8281e0cd0..8253890d87 100644 --- a/src/add-ons/input_server/devices/keyboard/Jamfile +++ b/src/add-ons/input_server/devices/keyboard/Jamfile @@ -1,6 +1,7 @@ SubDir OBOS_TOP src add-ons input_server devices keyboard ; UsePrivateHeaders input ; +UsePrivateHeaders kernel ; Addon keyboard : input_server/devices : KeyboardInputDevice.cpp @@ -15,7 +16,7 @@ Addon keyboard : input_server/devices : if $(COMPILE_FOR_R5) { LinkSharedOSLibs keyboard : be ; } else { - LinkSharedOSLibs keyboard : libbe.so ; + LinkSharedOSLibs keyboard : libroot.so libbe.so ; } Package haiku-inputkit-cvs : diff --git a/src/add-ons/input_server/devices/keyboard/TMWindow.cpp b/src/add-ons/input_server/devices/keyboard/TMWindow.cpp index 5b47f25c4f..6b7c02d58f 100644 --- a/src/add-ons/input_server/devices/keyboard/TMWindow.cpp +++ b/src/add-ons/input_server/devices/keyboard/TMWindow.cpp @@ -25,9 +25,12 @@ const uint32 TM_FORCE_REBOOT = 'TMfr'; const uint32 TM_KILL_APPLICATION = 'TMka'; const uint32 TM_SELECTED_TEAM = 'TMst'; -extern "C" void _kshutdown_(long arg); -#define SHUTDOWN_HALT 0 -#define SHUTDOWN_REBOOT 1 +#ifdef COMPILE_FOR_R5 +extern "C" void _kshutdown_(bool reboot); +#else +#include +#define _kshutdown_(x) _kern_shutdown(x) +#endif TMWindow::TMWindow() : BWindow(BRect(0,0,350,300), "Team Monitor", @@ -102,7 +105,7 @@ TMWindow::MessageReceived(BMessage *msg) switch(msg->what) { case TM_FORCE_REBOOT: - _kshutdown_(SHUTDOWN_REBOOT); + _kshutdown_(true); break; case TM_KILL_APPLICATION: { TMListItem *item = (TMListItem*)fBackground->fListView->ItemAt(