From 9cebe4bb354225f0e707352835c9e0cfc48e8268 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Wed, 15 Feb 2012 01:33:51 +0000
Subject: [PATCH] API: Remove apparently unnecessary include of carbon.h

svn path=/trunk/boinc/; revision=25262
---
 api/boinc_api.h            | 4 ----
 checkin_notes              | 9 +++++++++
 clientscr/gfx_switcher.cpp | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/api/boinc_api.h b/api/boinc_api.h
index 9c8dfcf730..805f7a48ec 100644
--- a/api/boinc_api.h
+++ b/api/boinc_api.h
@@ -18,10 +18,6 @@
 #ifndef _BOINC_API_
 #define _BOINC_API_
 
-#ifdef __APPLE__
-#include <Carbon/Carbon.h>
-#endif
-
 #ifdef _WIN32
 #include "boinc_win.h"
 #endif
diff --git a/checkin_notes b/checkin_notes
index f804bfbd62..6c372be137 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1692,3 +1692,12 @@ David  14 Feb 2012
 
     html/inc/
         db_ops.inc
+
+Charlie 14 Feb 2012
+    - API: Remove apparently unnecessary include of carbon.h (requested 
+        by Bernd Machenschalk.)
+
+    api/
+        boinc_api.h
+    clientscr/
+        gfx_switcher.cpp
diff --git a/clientscr/gfx_switcher.cpp b/clientscr/gfx_switcher.cpp
index 17c09db625..acac0f259b 100644
--- a/clientscr/gfx_switcher.cpp
+++ b/clientscr/gfx_switcher.cpp
@@ -31,6 +31,7 @@
 #endif
 #include <pwd.h>	// getpwuid
 #include <grp.h>
+#include <signal.h> // For kill()
 
 #include "boinc_api.h"
 #include "common_defs.h"