Permalink
Browse files

Merge pull request #970 from Memphiz/platformdarwin

[addons] change behaviour of system.platform.osx and add system.platform.darwin
  • Loading branch information...
2 parents fe529f8 + 2594331 commit cb4aaaa9171895399106bd9ac55ceb5549b1b33c @Memphiz Memphiz committed Jun 1, 2012
Showing with 3 additions and 4 deletions.
  1. +2 −3 xbmc/GUIInfoManager.cpp
  2. +1 −1 xbmc/GUIInfoManager.h
View
5 xbmc/GUIInfoManager.cpp
@@ -1011,7 +1011,7 @@ int CGUIInfoManager::TranslateSingleString(const CStdString &strCondition)
CStdString platform = info[2].name;
if (platform == "linux") return SYSTEM_PLATFORM_LINUX;
else if (platform == "windows") return SYSTEM_PLATFORM_WINDOWS;
- else if (platform == "osx") return SYSTEM_PLATFORM_OSX;
+ else if (platform == "darwin") return SYSTEM_PLATFORM_DARWIN;
else if (platform == "osx") return SYSTEM_PLATFORM_DARWIN_OSX;
else if (platform == "ios") return SYSTEM_PLATFORM_DARWIN_IOS;
else if (platform == "atv2") return SYSTEM_PLATFORM_DARWIN_ATV2;
@@ -1886,8 +1886,7 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
#else
bReturn = false;
#endif
- else if (condition == SYSTEM_PLATFORM_OSX)
- // TODO: rename SYSTEM_PLATFORM_OSX to SYSTEM_PLATFORM_DARWIN after eden release.
+ else if (condition == SYSTEM_PLATFORM_DARWIN)
#ifdef TARGET_DARWIN
bReturn = true;
#else
View
2 xbmc/GUIInfoManager.h
@@ -386,7 +386,7 @@ namespace INFO
#define SYSTEM_PLATFORM_XBOX 740
#define SYSTEM_PLATFORM_LINUX 741
#define SYSTEM_PLATFORM_WINDOWS 742
-#define SYSTEM_PLATFORM_OSX 743
+#define SYSTEM_PLATFORM_DARWIN 743
#define SYSTEM_PLATFORM_DARWIN_OSX 744
#define SYSTEM_PLATFORM_DARWIN_IOS 745
#define SYSTEM_PLATFORM_DARWIN_ATV2 746

0 comments on commit cb4aaaa

Please sign in to comment.