#include "util.h"
#include "sync.h"
#include "version.h"
-#include "ui_interface.h"
+#include "interface.h"
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
#include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
-
-// Work around clang compilation problem in Boost 1.46:
-// /usr/include/boost/program_options/detail/config_file.hpp:163:17: error: call to function 'to_internal' that is neither visible in the template definition nor found by argument-dependent lookup
-// See also: http://stackoverflow.com/questions/10020179/compilation-fail-in-boost-librairies-program-options
-// http://clang.debian.net/status.php?version=3.0&key=CANNOT_FIND_FUNCTION
-namespace boost {
- namespace program_options {
- std::string to_internal(const std::string&);
- }
-}
-
#include <boost/program_options/detail/config_file.hpp>
#include <boost/program_options/parsers.hpp>
#include <boost/filesystem.hpp>
#include <openssl/rand.h>
#ifdef WIN32
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0501
-#ifdef _WIN32_IE
-#undef _WIN32_IE
-#endif
-#define _WIN32_IE 0x0501
-#define WIN32_LEAN_AND_MEAN 1
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
#include <io.h> /* for _commit */
#include "shlobj.h"
#elif defined(__linux__)
pathRet = fs::path("/");
else
pathRet = fs::path(pszHome);
-#ifdef MAC_OSX
+#ifdef __APPLE__
// Mac
pathRet /= "Library/Application Support";
fs::create_directory(pathRet);
#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;