darwin, fixed, compiler warning. DarwinUtils.h is C linkage so you should not be...

diff --git a/xbmc/osx/DarwinUtils.h b/xbmc/osx/DarwinUtils.h
index e0d3f97..a20016b 100644 (file)
--- a/xbmc/osx/DarwinUtils.h
+++ b/xbmc/osx/DarwinUtils.h
@@ -38,7 +38,7 @@ extern "C"
   float       GetIOSVersion(void);
   int         GetDarwinFrameworkPath(bool forPython, char* path, uint32_t *pathsize);
   int         GetDarwinExecutablePath(char* path, uint32_t *pathsize);
-  const std::string& DarwinGetXbmcRootFolder(void);
+  const char *DarwinGetXbmcRootFolder(void);
   bool        DarwinIsIosSandboxed(void);
   bool        DarwinHasVideoToolboxDecoder(void);
   int         DarwinBatteryLevel(void);

diff --git a/xbmc/osx/DarwinUtils.mm b/xbmc/osx/DarwinUtils.mm
index cf55582..f9b390d 100644 (file)
--- a/xbmc/osx/DarwinUtils.mm
+++ b/xbmc/osx/DarwinUtils.mm
@@ -277,7 +277,7 @@ int  GetDarwinExecutablePath(char* path, uint32_t *pathsize)
   return 0;
 }
 
-const std::string& DarwinGetXbmcRootFolder(void)
+const char* DarwinGetXbmcRootFolder(void)
 {
   static std::string rootFolder = "";
   if ( rootFolder.length() == 0)
@@ -294,7 +294,7 @@ const std::string& DarwinGetXbmcRootFolder(void)
       rootFolder = "Library/Preferences";
     }
   }
-  return rootFolder;
+  return rootFolder.c_str();
 }
 
 bool DarwinIsIosSandboxed(void)

diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 665be8f..0f30d84 100644 (file)
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -420,7 +420,7 @@ void CAdvancedSettings::Initialize()
     #if defined(TARGET_DARWIN_OSX)
     logDir += "/Library/Logs/";
     #else // ios/atv2
-    logDir += "/" + DarwinGetXbmcRootFolder() + "/";
+    logDir += "/" + CStdString(DarwinGetXbmcRootFolder()) + "/";
     #endif
     m_logFolder = logDir;
   #else