From 9b97daa34f291e77f6a4422e7524a69286dcf012 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Wed, 10 Apr 2013 17:54:41 -0700
Subject: [PATCH] Mac: Cix compile errors

---
 client/app_control.cpp  | 6 ++++--
 clientgui/WelcomePage.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/app_control.cpp b/client/app_control.cpp
index 8bd7ff1051..c805ce43bd 100644
--- a/client/app_control.cpp
+++ b/client/app_control.cpp
@@ -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",
diff --git a/clientgui/WelcomePage.h b/clientgui/WelcomePage.h
index 42709694bd..0585ec9f0a 100644
--- a/clientgui/WelcomePage.h
+++ b/clientgui/WelcomePage.h
@@ -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;