Fixed XP server backport.

mtconnect · Nov 17, 2013 · 21f5aa1 · 21f5aa1
1 parent 474d7ff
commit 21f5aa1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -16,8 +16,6 @@
 
 #include "ref_counted.hpp"
 #include "dlib/threads.h"
-#include <libkern/OSAtomic.h>
-
 
 static dlib::rmutex sRefMutex;
 

diff --git 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)