From c00a77c85acb0bbdbe875c04c8f88cda05ca3485 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 3 May 2001 13:19:52 +0000
Subject: [PATCH] fix compile problem with gcc 2.95.3 and lyxstring

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_1_6@1978 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog      | 5 +++++
 src/Lsstream.h | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5065feee96..7752a85ae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-03  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/Lsstream.h: include LString.h before the sstream headers to
+	fix problem with gcc 2.95.3 and lyxstring
+
 2000-04-19  Allan Rae  <rae@lyx.org>
 
 	* sigc++/: updated to libsigc++-1.0.3.  This should hopefully fix some
diff --git a/src/Lsstream.h b/src/Lsstream.h
index 79330e2d79..536899566d 100644
--- a/src/Lsstream.h
+++ b/src/Lsstream.h
@@ -12,6 +12,10 @@
 #ifndef LSSTREAM_H
 #define LSSTREAM_H 
 
+// Since we will include a string header anyway, we'd better do it
+// right now so that <string> is not loaded before lyxstring.h. (JMarc)
+#include "LString.h"
+
 #ifdef HAVE_SSTREAM
 #include <sstream>
 #else