Merge #5366: No longer check osx compatibility in RenameThread

850c570 No longer check osx compatibility in RenameThread (Michael Ford)

diff --combined src/util.cpp
index 0d0f7e5f919d1f6e4b96c958b8e7268ee0252508,d40b985dc17d1e480b5cae8c2c902af706266191..361b3631f567121acb310c958eabc92a9a608d60
--- 1/src/util.cpp
--- 2/src/util.cpp
+++ b/src/util.cpp
@@@ -1,5 -1,5 +1,5 @@@
  // Copyright (c) 2009-2010 Satoshi Nakamoto
 -// Copyright (c) 2009-2014 The Bitcoin developers
 +// Copyright (c) 2009-2014 The Bitcoin Core developers
  // Distributed under the MIT software license, see the accompanying
  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
  
@@@ -346,7 -346,7 +346,7 @@@ bool SoftSetBoolArg(const std::string& 
          return SoftSetArg(strArg, std::string("0"));
  }
  
 -static std::string FormatException(std::exception* pex, const char* pszThread)
 +static std::string FormatException(const std::exception* pex, const char* pszThread)
  {
  #ifdef WIN32
      char pszModule[MAX_PATH] = "";
@@@ -362,7 -362,7 +362,7 @@@
              "UNKNOWN EXCEPTION       \n%s in %s       \n", pszModule, pszThread);
  }
  
 -void PrintExceptionContinue(std::exception* pex, const char* pszThread)
 +void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
  {
      std::string message = FormatException(pex, pszThread);
      LogPrintf("\n\n************************\n%s\n", message);
@@@ -514,7 -514,7 +514,7 @@@ bool TryCreateDirectory(const boost::fi
      try
      {
          return boost::filesystem::create_directory(p);
 -    } catch (boost::filesystem::filesystem_error) {
 +    } catch (const boost::filesystem::filesystem_error&) {
          if (!boost::filesystem::exists(p) || !boost::filesystem::is_directory(p))
              throw;
      }
@@@ -698,13 -698,8 +698,8 @@@ void RenameThread(const char* name
      //       removed.
      pthread_set_name_np(pthread_self(), name);
  
- #elif defined(MAC_OSX) && defined(__MAC_OS_X_VERSION_MAX_ALLOWED)
- 
- // pthread_setname_np is XCode 10.6-and-later
- #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+ #elif defined(MAC_OSX)
      pthread_setname_np(name);
- #endif
- 
  #else
      // Prevent warnings for unused parameters...
      (void)name;
@@@ -721,7 -716,8 +716,7 @@@ void SetupEnvironment(
  #else // boost filesystem v2
              std::locale();                      // Raises runtime error if current locale is invalid
  #endif
 -    } catch(std::runtime_error &e)
 -    {
 +    } catch (const std::runtime_error&) {
          setenv("LC_ALL", "C", 1); // Force C locale
      }
  #endif