Fixes for building on OSX

Open-Transactions · Nov 5, 2014 · d01e411 · d01e411
1 parent 8a438af
commit d01e411
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/OTLog.cpp b/src/core/OTLog.cpp
@@ -902,8 +902,8 @@ void ot_terminate()
 // exception header is needed, on latter android NDK the header is not available
 // see https://code.google.com/p/android/issues/detail?id=62648
 #ifndef _EXCEPTION_PTR_H
-#ifndef ANDROID
-#error "it is expected that only android is missing exception header"
+#if !defined(ANDROID) && !defined(__APPLE__)
+#error "it is expected that only android and OSX are missing exception_ptr.h"
 #endif
 #else
     if (auto e = std::current_exception()) {

diff --git a/src/core/util/OTPaths.cpp b/src/core/util/OTPaths.cpp
@@ -1103,8 +1103,8 @@ bool OTPaths::GetHomeFromSystem(String& out_strHomeFolder)
 
 #elif defined(__APPLE__)
 
-    OTString home(getenv("HOME"));
-    OTString library = "";
+    String home(getenv("HOME"));
+    String library = "";
     AppendFolder(library, home, "Library");
     AppendFolder(out_strHomeFolder, library, "Application Support");