[atv2] - fix compilation on 10.8 and all others once and for all. Dear buildbot. I really suggest you build this now - or i'm going to convince davilla to install android on your harddisk...

2 files changed, 18 insertions, 18 deletions

diff --git a/xbmc/osx/atv2/XBMCAppliance.mm b/xbmc/osx/atv2/XBMCAppliance.mm
index ba443770f9..f301a298b9 100644
--- a/xbmc/osx/atv2/XBMCAppliance.mm
+++ b/xbmc/osx/atv2/XBMCAppliance.mm
@@ -187,8 +187,8 @@ static id (*XBMCAppliance$applianceInfo$Orig)(XBMCAppliance*, SEL);
 // since we can't inject ivars we need to use associated objects
 // these are the keys for XBMCAppliance
 //implementation XBMCAppliance
-static char const * const topShelfControllerKey = "topShelfController";
-static char const * const applianceCategoriesKey = "applianceCategories";
+static char topShelfControllerKey;
+static char applianceCategoriesKey;
 
 static NSString* XBMCApplianceInfo$key(XBMCApplianceInfo* self, SEL _cmd)
 {
@@ -307,23 +307,23 @@ static id XBMCAppliance$applianceInfo(XBMCAppliance* self, SEL _cmd)
 
 static id XBMCAppliance$topShelfController(XBMCAppliance* self, SEL _cmd) 
 { 
-  return objc_getAssociatedObject(self, (const void*)topShelfControllerKey);
+  return objc_getAssociatedObject(self, &topShelfControllerKey);
 }
 
 
 static void XBMCAppliance$setTopShelfController(XBMCAppliance* self, SEL _cmd, id topShelfControl) 
 { 
-  objc_setAssociatedObject(self, (const void*)topShelfControllerKey, topShelfControl, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(self, &topShelfControllerKey, topShelfControl, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 static id XBMCAppliance$applianceCategories(XBMCAppliance* self, SEL _cmd) 
 {
-  return objc_getAssociatedObject(self, (const void*)applianceCategoriesKey);
+  return objc_getAssociatedObject(self, &applianceCategoriesKey);
 }
 
 static void XBMCAppliance$setApplianceCategories(XBMCAppliance* self, SEL _cmd, id applianceCategories)
 { 
-  objc_setAssociatedObject(self, (const void*)applianceCategoriesKey, applianceCategories, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(self, &applianceCategoriesKey, applianceCategories, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 static id XBMCAppliance$initWithApplianceInfo(XBMCAppliance* self, SEL _cmd, id applianceInfo) 
diff --git a/xbmc/osx/atv2/XBMCController.mm b/xbmc/osx/atv2/XBMCController.mm
index 23b00b59bc..0130f75fce 100644
--- a/xbmc/osx/atv2/XBMCController.mm
+++ b/xbmc/osx/atv2/XBMCController.mm
@@ -230,10 +230,10 @@ int padding[16];//obsolete? - was commented with "credit is due here to Sapphire
 // SECTIONCOMMENT
 // since we can't inject ivars we need to use associated objects
 // these are the keys for XBMCController
-static char const * const timerKey = "m_keyTimer";
-static char const * const glviewKey = "m_glView";
-static char const * const screensaverKey = "m_screenSaverTimeout";
-static char const * const systemsleepKey = "m_systemsleepTimeout";
+static char timerKey;
+static char glviewKey;
+static char screensaverKey;
+static char systemsleepKey;
 
 //
 //
@@ -242,42 +242,42 @@ static char const * const systemsleepKey = "m_systemsleepTimeout";
  
 static id XBMCController$keyTimer(XBMCController* self, SEL _cmd) 
 { 
-  return objc_getAssociatedObject(self, (const void*)timerKey);
+  return objc_getAssociatedObject(self, &timerKey);
 }
 
 static void XBMCController$setKeyTimer(XBMCController* self, SEL _cmd, id timer) 
 { 
-  objc_setAssociatedObject(self, (const void*)timerKey, timer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(self, &timerKey, timer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 static id XBMCController$glView(XBMCController* self, SEL _cmd) 
 { 
-  return objc_getAssociatedObject(self, (const void*)glviewKey);
+  return objc_getAssociatedObject(self, &glviewKey);
 }
 
 static void XBMCController$setGlView(XBMCController* self, SEL _cmd, id view) 
 { 
-  objc_setAssociatedObject(self, (const void*)glviewKey, view, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(self, &glviewKey, view, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 static id XBMCController$systemScreenSaverTimeout(XBMCController* self, SEL _cmd) 
 { 
-  return objc_getAssociatedObject(self, (const void*)screensaverKey);
+  return objc_getAssociatedObject(self, &screensaverKey);
 }
 
 static void XBMCController$setSystemScreenSaverTimeout(XBMCController* self, SEL _cmd, id timeout) 
 { 
-  objc_setAssociatedObject(self, (const void*)screensaverKey, timeout, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(self, &screensaverKey, timeout, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 static id XBMCController$systemSleepTimeout(XBMCController* self, SEL _cmd) 
 { 
-  return objc_getAssociatedObject(self, (const void*)systemsleepKey);
+  return objc_getAssociatedObject(self, &systemsleepKey);
 }
 
 static void XBMCController$setSystemSleepTimeout(XBMCController* self, SEL _cmd, id timeout) 
 { 
-  objc_setAssociatedObject(self, (const void*)systemsleepKey, timeout, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(self, &systemsleepKey, timeout, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 static void XBMCController$applicationDidExit(XBMCController* self, SEL _cmd)