MacOSX compile fix.

[lyx.git] / src / support / lyxsum.C

diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C
index 22ddf19d51fc0988adb430cbe6d8380b7e84b36d..b9cee3289b50dfb883a751143ae606a0509ff072 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -11,12 +11,16 @@
 #include <config.h>
 
 #include "support/lyxlib.h"
+
 #include "debug.h"
 
-#include <algorithm>
 #include <boost/crc.hpp>
 
+#include <algorithm>
+
 using std::endl;
+using std::string;
+
 
 // OK, this is ugly, but it is the only workaround I found to compile
 // with gcc (any version) on a system which uses a non-GNU toolchain.
@@ -25,7 +29,7 @@ using std::endl;
 // understand those weak symbols (seen on HP-UX, tru64, AIX and
 // others). Thus we force an explicit instanciation of this particular
 // template (JMarc)
-template class boost::detail::crc_table_t<32, 0x04C11DB7, true>;
+template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
 
 // Various implementations of lyx::sum(), depending on what methods
 // are available. Order is faster to slowest.
@@ -35,16 +39,19 @@ template class boost::detail::crc_table_t<32, 0x04C11DB7, true>;
 // not `compatibility' version with caddr_t.
 #define _POSIX_C_SOURCE 199506L
 
-#include <sys/types.h>
-#include <sys/stat.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #include <fcntl.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <sys/mman.h>
 
 
-using std::string;
-
-
 unsigned long lyx::support::sum(string const & file)
 {
        lyxerr[Debug::FILES] << "lyx::sum() using mmap (lightning fast)"
@@ -96,8 +103,8 @@ unsigned long do_crc(InputIterator first, InputIterator last)
 
 } // namespace
 
-#if HAVE_DECL_ISTREAMBUF_ITERATOR
 using std::ifstream;
+#if HAVE_DECL_ISTREAMBUF_ITERATOR
 using std::istreambuf_iterator;
 
 unsigned long lyx::support::sum(string const & file)