From 21f5aa105e16398b89205c005296ca6e897d41fa Mon Sep 17 00:00:00 2001 From: Will Sobel Date: Sat, 16 Nov 2013 16:06:31 -0800 Subject: [PATCH] Fixed XP server backport. --- agent/agent.cpp | 2 +- agent/ref_counted.cpp | 2 -- lib/dlib/sockets/sockets_kernel_1.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/agent/agent.cpp b/agent/agent.cpp index b72910a6d..d5f9e3557 100644 --- a/agent/agent.cpp +++ b/agent/agent.cpp @@ -196,7 +196,7 @@ void Agent::start() } // Start the server. This blocks until the server stops. - server::http_1a::start(); + server_http::start(); } catch (dlib::socket_error &e) { sLogger << LFATAL << "Cannot start server: " << e.what(); diff --git a/agent/ref_counted.cpp b/agent/ref_counted.cpp index c8d7df2df..d8f976f6a 100644 --- a/agent/ref_counted.cpp +++ b/agent/ref_counted.cpp @@ -16,8 +16,6 @@ #include "ref_counted.hpp" #include "dlib/threads.h" -#include - static dlib::rmutex sRefMutex; diff --git a/lib/dlib/sockets/sockets_kernel_1.cpp b/lib/dlib/sockets/sockets_kernel_1.cpp index 37e238742..d96a75fd0 100644 --- a/lib/dlib/sockets/sockets_kernel_1.cpp +++ b/lib/dlib/sockets/sockets_kernel_1.cpp @@ -331,8 +331,8 @@ namespace dlib static inline ADDRESS_FAMILY sockaddr_family(const std::string &ip, int &len) { - return AF_INET; len = sizeof(sockaddr_in); + return AF_INET; } static inline bool set_sockaddr_address(sockaddr_storage &sin, const std::string &ip)