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 640e73f700cfdf02cc898d306b605206b3ac24b9..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,10 +23,12 @@
 #include <cerrno>
 
 using std::endl;
-using std::strerror;
-
 using std::string;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strerror;
+#endif
+
 // This MACRO eppears to be defined only on Linux.
 #if !defined(SUN_LEN)
 #define SUN_LEN(su) \