compile fixes for stlport

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7930 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 83a24e33b5629fafa310c688ae95bf83a3d36d8b..519111b7d8d267b9da0d0113ea5e41244f01663e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxsocket.C: include <cerrno>
+
 2003-10-17  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * lyxfunc.C (dispatch): remove textcache stuff

diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index b84a51d15c7c84ad876e0ba98680fe9c398b40b9..429d6ee2e8e79686c16f4d8bc977b87f92dfc9f1 100644 (file)
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -25,6 +25,7 @@
 #include "support/socktools.h"
 
 #include <iostream>
+#include <cerrno>
 
 using std::endl;
 using std::string;

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 47f6b432cdab46d848173b695e69d61e10a4720a..1b59652977e6ed635c210c39f12dd678b82454e2 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,6 @@
+2003-10-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * socktools.C: honor CXX_GLOBAL_CSTD
 
 2003-10-16  André Pönitz  <poenitz@gmx.net>
 

diff --git a/src/support/socktools.C b/src/support/socktools.C
index 640e73f700cfdf02cc898d306b605206b3ac24b9..1e6a0af1dea70ad6ab7954bd3779c299c9adcee8 100644 (file)
--- a/src/support/socktools.C
+++ b/src/support/socktools.C
@@ -22,10 +22,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) \