X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServerSocket.cpp;h=fd903ce18fa4f69898da1516ae4d2acb5b2b2602;hb=80983a35535753992ab1499e2230592063f6ddcb;hp=fb6e3bf75c6abe24c62e7c7b05ad683041b6df74;hpb=b6aed54c45cf4a479cfd11e3e6851194f5a05947;p=lyx.git

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index fb6e3bf75c..fd903ce18f 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -26,17 +26,23 @@
 #include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
+#include "support/lassert.h"
 #include "support/socktools.h"
 
-#include "support/bind.h"
+#include <boost/assert.hpp>
 
 #include <cerrno>
+#include <cstring>
 #include <ostream>
 
 #if defined (_WIN32)
 # include <io.h>
 #endif
 
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 using namespace std;
 using namespace lyx::support;
 
@@ -110,8 +116,7 @@ void ServerSocket::serverCallback()
 	}
 
 	// Register the new client.
-	clients[client_fd] =
-		shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
+	clients[client_fd] = make_shared<LyXDataSocket>(client_fd);
 	theApp()->registerSocketCallback(
 		client_fd,
 		bind(&ServerSocket::dataCallback,