Make it clearer where include files are comming from.

[lyx.git] / src / support / socktools.C

diff --git a/src/support/socktools.C b/src/support/socktools.C
index 8e28da55f097e25c44adf54d3392e379fccfee75..4b4edd60f4ddd50a76ab68619993db5171092411 100644 (file)
--- a/src/support/socktools.C
+++ b/src/support/socktools.C
@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "socktools.h"
+#include "support/socktools.h"
+#include "support/lyxlib.h"
+
 #include "debug.h"
-#include "lyxlib.h"
 
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -22,9 +23,17 @@
 #include <cerrno>
 
 using std::endl;
+using std::string;
+
+#ifndef CXX_GLOBAL_CSTD
 using std::strerror;
+#endif
 
-using std::string;
+// This MACRO eppears to be defined only on Linux.
+#if !defined(SUN_LEN)
+#define SUN_LEN(su) \
+       (sizeof (*(su)) - sizeof ((su)->sun_path) + strlen((su)->sun_path))
+#endif
 
 
 namespace lyx {