diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-24 18:49:48 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-24 18:49:48 +0200 |
| commit | b373d0f15ee0920022041fe8cba08f3b6c92d3d9 (patch) | |
| tree | 3345697363bedbf80563bd50585e4b9fba240f67 | |
| parent | Merge pull request #2961 (diff) | |
| parent | Fix Windows build (diff) | |
| download | monero-b373d0f15ee0920022041fe8cba08f3b6c92d3d9.tar.xz | |
Merge pull request #2994
2018cf74 Fix Windows build (dEBRUYNE-1)
| -rw-r--r-- | contrib/epee/include/misc_os_dependent.h | 4 | ||||
| -rw-r--r-- | external/easylogging++/ea_config.h | 1 | ||||
| -rw-r--r-- | src/daemonizer/windows_service.cpp | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/contrib/epee/include/misc_os_dependent.h b/contrib/epee/include/misc_os_dependent.h index 81cecf714..99690b301 100644 --- a/contrib/epee/include/misc_os_dependent.h +++ b/contrib/epee/include/misc_os_dependent.h @@ -23,6 +23,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#ifdef _WIN32 +#include <Winsock2.h> +#endif + #ifdef WIN32 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/external/easylogging++/ea_config.h b/external/easylogging++/ea_config.h index 2524d3477..6215e67de 100644 --- a/external/easylogging++/ea_config.h +++ b/external/easylogging++/ea_config.h @@ -8,3 +8,4 @@ #endif #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING #define ELPP_NO_CHECK_MACROS +#define ELPP_WINSOCK2 diff --git a/src/daemonizer/windows_service.cpp b/src/daemonizer/windows_service.cpp index d540f5bf8..9b8e46615 100644 --- a/src/daemonizer/windows_service.cpp +++ b/src/daemonizer/windows_service.cpp @@ -26,6 +26,9 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <boost/chrono/chrono.hpp> +#include <boost/thread/thread.hpp> + #undef UNICODE #undef _UNICODE |