Fixed XP server backport.

Will Sobel · Will Sobel · commit 21f5aa105e16 · 2013-11-16T16:06:31.000-08:00
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)

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ void Agent::start()`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`// Start the server. This blocks until the server stops.`
`199`		`- server::http_1a::start();`
	`199`	`+ server_http::start();`
`200`	`200`	`}`
`201`	`201`	`catch (dlib::socket_error &e) {`
`202`	`202`	`sLogger << LFATAL << "Cannot start server: " << e.what();`
Original file line number	Diff line number	Diff line change
`@@ -331,8 +331,8 @@ namespace dlib`
`331`	`331`
`332`	`332`	`static inline ADDRESS_FAMILY sockaddr_family(const std::string &ip, int &len)`
`333`	`333`	`{`
`334`		`- return AF_INET;`
`335`	`334`	`len = sizeof(sockaddr_in);`
	`335`	`+ return AF_INET;`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`static inline bool set_sockaddr_address(sockaddr_storage &sin, const std::string &ip)`