i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

registrar: Remove now-unused non-Haiku code.

Browse Source
This commit is contained in:
Augustin Cavalier
2018-11-10 15:16:25 -05:00
parent 387609c3be
commit 23623eee9a
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/registrar/ShutdownProcess.cpp
+7 -24
View File
@@ -1007,11 +1007,7 @@ ShutdownProcess::_AddShutdownWindowApps(AppInfoList& infos)
} }
// get the application icons // get the application icons
#ifdef __HAIKU__
color_space format = B_RGBA32; color_space format = B_RGBA32;
#else
color_space format = B_CMAP8;
#endif
// mini icon // mini icon
BBitmap* miniIcon = new(nothrow) BBitmap(BRect(0, 0, 15, 15), format); BBitmap* miniIcon = new(nothrow) BBitmap(BRect(0, 0, 15, 15), format);
@@ -1380,13 +1376,10 @@ ShutdownProcess::_WorkerDoShutdown()
// either there's no GUI or reboot failed: we enter the kernel debugger // either there's no GUI or reboot failed: we enter the kernel debugger
// instead // instead
#ifdef __HAIKU__ while (true) {
// TODO: Introduce the syscall. _kern_kernel_debugger("The system is shut down. It's now safe to turn "
// while (true) { "off the computer.");
// _kern_kernel_debugger("The system is shut down. It's now safe to turn " }
// "off the computer.");
// }
#endif
} }
@@ -1680,13 +1673,8 @@ ShutdownProcess::_QuitNonApps()
if (fVitalSystemApps.find(teamInfo.team) == fVitalSystemApps.end()) { if (fVitalSystemApps.find(teamInfo.team) == fVitalSystemApps.end()) {
PRINT(" sending team %" B_PRId32 " TERM signal\n", teamInfo.team); PRINT(" sending team %" B_PRId32 " TERM signal\n", teamInfo.team);
#ifdef __HAIKU__ // Note: team ID == team main thread ID under Haiku
// Note: team ID == team main thread ID under Haiku send_signal(teamInfo.team, SIGTERM);
send_signal(teamInfo.team, SIGTERM);
#else
// We don't want to do this when testing under R5, since it
// would kill all teams besides our app server and registrar.
#endif
} }
} }
@@ -1701,12 +1689,7 @@ ShutdownProcess::_QuitNonApps()
if (fVitalSystemApps.find(teamInfo.team) == fVitalSystemApps.end()) { if (fVitalSystemApps.find(teamInfo.team) == fVitalSystemApps.end()) {
PRINT(" killing team %" B_PRId32 "\n", teamInfo.team); PRINT(" killing team %" B_PRId32 "\n", teamInfo.team);
#ifdef __HAIKU__ kill_team(teamInfo.team);
kill_team(teamInfo.team);
#else
// We don't want to do this when testing under R5, since it
// would kill all teams besides our app server and registrar.
#endif
} }
} }