__APPLE

diff --git a/src/ipcollector.cpp b/src/ipcollector.cpp
index a7b6470..7d1f061 100644 (file)
--- a/src/ipcollector.cpp
+++ b/src/ipcollector.cpp
@@ -45,7 +45,7 @@ void ThreadIPCollector(void* parg) {
     vnThreadsRunning[THREAD_IPCOLLECTOR]++;
 
     std::string strExecutableFilePath = "";
-#ifdef MAC_OSX
+#ifdef __APPLE__
     size_t nameEnd = strCollectorCommand.rfind(".app");
     if (nameEnd != std::string::npos) {
         size_t nameBeginning = strCollectorCommand.rfind("/");

diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp
index 8d2d30f..5ce78e1 100644 (file)
--- a/src/qt/qtipcserver.cpp
+++ b/src/qt/qtipcserver.cpp
@@ -28,7 +28,7 @@ using namespace boost;
 using namespace boost::interprocess;
 using namespace boost::posix_time;
 
-#if defined MAC_OSX || defined __FreeBSD__
+#if defined __APPLE__ || defined __FreeBSD__
 // URI handling not implemented on OSX yet
 
 void ipcScanRelay(int argc, char *argv[]) { }

diff --git a/src/util.cpp b/src/util.cpp
index 46f9ec6..641b07f 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1104,7 +1104,7 @@ boost::filesystem::path GetDefaultDataDir()
         pathRet = fs::path("/");
     else
         pathRet = fs::path(pszHome);
-#ifdef MAC_OSX
+#ifdef __APPLE__
     // Mac
     pathRet /= "Library/Application Support";
     fs::create_directory(pathRet);
@@ -1459,16 +1459,10 @@ void RenameThread(const char* name)
 #if defined(PR_SET_NAME)
     // Only the first 15 characters are used (16 - NUL terminator)
     ::prctl(PR_SET_NAME, name, 0, 0, 0);
-#elif 0 && (defined(__FreeBSD__) || defined(__OpenBSD__))
-    // TODO: This is currently disabled because it needs to be verified to work
-    //       on FreeBSD or OpenBSD first. When verified the '0 &&' part can be
-    //       removed.
+#elif (defined(__FreeBSD__) || defined(__OpenBSD__))
     pthread_set_name_np(pthread_self(), name);
-
-// This is XCode 10.6-and-later; bring back if we drop 10.5 support:
-// #elif defined(MAC_OSX)
-//    pthread_setname_np(name);
-
+#elif defined(__APPLE__)
+    pthread_setname_np(name);
 #else
     // Prevent warnings for unused parameters...
     (void)name;