the ios issue

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

diff --git a/config/ChangeLog b/config/ChangeLog
index 3ad562a50627da7929761c2b5f723926594eba13..6328d4583e4895e934ddde9a8d433eff3c4e4fdc 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,10 @@
+2003-06-11  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * configure.ac: also check for <ios> header
+
 2003-05-26  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-       * relyx_configure.ac: 
+       * relyx_configure.ac:
        * relyx_configure.in: add AM_MAINTAINER_MODE here too.
 
 2003-05-20  Angus Leeming  <leeming@lyx.org>

diff --git a/config/configure.ac b/config/configure.ac
index d9a5a0d16e1afb0641c23cb5322f8b6c2bd636d1..f2c33e9e4b52ebe7e29841f37e40380dde9d2f04 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -73,7 +73,7 @@ LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream locale limits)
+AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 LYX_CXX_STL_MODERN_STREAMS
 
 ### and now some special lyx flags.

diff --git a/src/ChangeLog b/src/ChangeLog
index 26bddd322b1c4e950cae7e52ae30073a8652861f..137b7d4ba6027f7b20410a23ed4db4ac41014891 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-11  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * main.C: protect <ios> with HAVE_IOS
+       (main): protect sync_with_stdio with HAVE_IOS
+
 2003-06-10  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * text2.C (cutSelection): adjust

diff --git a/src/main.C b/src/main.C
index 6ba9adc0c7608d0448f633dc296312a3e200067c..1b21c24b6fa5868ebe24a6d7dedaaeb00cec5971 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -13,11 +13,15 @@
 #include "gettext.h"
 #include "support/os.h"
 
+#ifdef HAVE_IOS
 #include <ios>
+#endif
 
 int main(int argc, char * argv[])
 {
-       std::ios::sync_with_stdio(false);
+#ifdef HAVE_IOS
+       std::ios_base::sync_with_stdio(false);
+#endif
 
        os::init(&argc, &argv);