Commit d57b97351838f4808a205b8db161f040374778a9

Alex Szpakowski 2015-05-16T12:05:42

Mac: Use CoreFoundation headers instead of Carbon headers, in GetPowerInfo code.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
diff --git a/src/power/macosx/SDL_syspower.c b/src/power/macosx/SDL_syspower.c
index 9bcacaf..dd74e0a 100644
--- a/src/power/macosx/SDL_syspower.c
+++ b/src/power/macosx/SDL_syspower.c
@@ -23,13 +23,13 @@
 #ifndef SDL_POWER_DISABLED
 #if SDL_POWER_MACOSX
 
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/ps/IOPowerSources.h>
 #include <IOKit/ps/IOPSKeys.h>
 
 #include "SDL_power.h"
 
-/* Carbon is so verbose... */
+/* CoreFoundation is so verbose... */
 #define STRMATCH(a,b) (CFStringCompare(a, b, 0) == kCFCompareEqualTo)
 #define GETVAL(k,v) \
     CFDictionaryGetValueIfPresent(dict, CFSTR(k), (const void **) v)