X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpch.h;h=05a5d0419fed87eff49fbc5687ac666469c81a4f;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=00d4ca123ea56849af2dd3185df0ce0b1a22c1cf;hpb=b0fbc29aa34345e1ffa54f6fd9193d7c42e577f2;p=lyx.git

diff --git a/src/pch.h b/src/pch.h
index 00d4ca123e..05a5d0419f 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -6,8 +6,7 @@
 #include <boost/crc.hpp>
 #include <boost/cregex.hpp>
 #include <boost/current_function.hpp>
-#include <boost/format.hpp>
-#include <boost/function/function0.hpp>
+// #include <boost/format.hpp> // mult def symbols problem (_1, _2 etc)
 #include <boost/function.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <boost/optional.hpp>
@@ -16,19 +15,30 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/connection.hpp>
-#include <boost/signals/signal0.hpp>
-#include <boost/signals/signal1.hpp>
-#include <boost/signals/signal2.hpp>
+#include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103300
+# include <boost/test/detail/nullstream.hpp>
+#else
+# include <boost/test/utils/nullstream.hpp>
+#endif
+
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
 
 #include <fcntl.h>
-#include <sys/select.h>
-#include <sys/stat.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
 
 #include <algorithm>
 #include <cerrno>
@@ -54,5 +64,6 @@
 #include <stack>
 #include <string>
 #include <utility>
+
 #include <utime.h>
 #include <vector>