Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Mac: Cix compile errors

This commit is contained in:
Charlie Fenton 2013-04-10 17:54:41 -07:00
parent 33bf4f7851
commit 9b97daa34f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/app_control.cpp
View File

@ -208,6 +208,7 @@ int ACTIVE_TASK::request_abort() {
#ifdef _WIN32
static void kill_app_process(int pid, bool will_restart) {
int retval = 0;
HANDLE h = OpenProcess(READ_CONTROL | PROCESS_TERMINATE, false, pid);
if (h == NULL) return;
TerminateProcess(h, will_restart?0:EXIT_ABORTED_BY_CLIENT);
@ -215,7 +216,8 @@ static void kill_app_process(int pid, bool will_restart) {
#else
static void kill_app_process(int pid, bool) {
#ifdef SANDBOX
int retval = kill_via_switcher(pid);
int retval = 0;
retval = kill_via_switcher(pid);
if (retval && log_flags.task_debug) {
msg_printf(0, MSG_INFO,
"[task] kill_via_switcher() failed: %s",
@ -223,7 +225,7 @@ static void kill_app_process(int pid, bool) {
);
}
#endif
int retval = kill(pid, SIGKILL);
retval = kill(pid, SIGKILL);
if (retval && log_flags.task_debug) {
msg_printf(0, MSG_INFO,
"[task] kill() failed: %s",

2
clientgui/WelcomePage.h
View File

@ -81,7 +81,7 @@ public:
// Determine if this the WCG branded version of the client
// and connected to WCG.
bool CWelcomePage::isWCGClient();
bool isWCGClient();
////@begin CWelcomePage member variables
wxStaticText* m_pTitleStaticCtrl;