From dab52aa183cf704ca33ad878728c0b6839486c86 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 17 Oct 2003 14:30:33 +0000 Subject: [PATCH] compile fixes for stlport git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7930 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/lyxsocket.C | 1 + src/support/ChangeLog | 3 +++ src/support/socktools.C | 6 ++++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 83a24e33b5..519111b7d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-10-14 Jean-Marc Lasgouttes + + * lyxsocket.C: include + 2003-10-17 Lars Gullik Bjønnes * lyxfunc.C (dispatch): remove textcache stuff diff --git a/src/lyxsocket.C b/src/lyxsocket.C index b84a51d15c..429d6ee2e8 100644 --- a/src/lyxsocket.C +++ b/src/lyxsocket.C @@ -25,6 +25,7 @@ #include "support/socktools.h" #include +#include using std::endl; using std::string; diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 47f6b432cd..1b59652977 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,6 @@ +2003-10-14 Jean-Marc Lasgouttes + + * socktools.C: honor CXX_GLOBAL_CSTD 2003-10-16 André Pönitz diff --git a/src/support/socktools.C b/src/support/socktools.C index 640e73f700..1e6a0af1de 100644 --- a/src/support/socktools.C +++ b/src/support/socktools.C @@ -22,10 +22,12 @@ #include 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) \ -- 2.39.2