X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Futil.cpp;h=76eb8a5755512f6f67419de4d0637f58e2a9b740;hb=47d3ceb3da845e216fc9577cbf52f8b5600e5f93;hp=641b07f78415d44334c98b20d3fe64fbb94dd991;hpb=629c7cc188db8b9e11516cb692bef5ff23ec30a7;p=novacoin.git diff --git a/src/util.cpp b/src/util.cpp index 641b07f..76eb8a5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -6,21 +6,10 @@ #include "util.h" #include "sync.h" #include "version.h" -#include "ui_interface.h" +#include "interface.h" #include #include // for to_lower() #include // 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 #include #include @@ -33,18 +22,6 @@ namespace boost { #include #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 /* for _commit */ #include "shlobj.h" #elif defined(__linux__)