Clean up some header files and fix compilation with MSC.

On MSC there is no <unistd.h>. It turns out that we need to #include <io.h>
in order to use close(3). This fixes the build failure introduced in 8305ec38.

Thanks to Jan Rheinländer for reporting this.

diff --git a/acinclude.m4 b/acinclude.m4
index 0b6db8c178d85ccfc4a85e93d2aec71069ad9245..53b45e5a9e8c0ac36712bc13206561eb6a40151e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -34,7 +34,6 @@ AC_CACHE_CHECK([for standard C++ header files], [ginac_cv_std_cxx_headers], [
                #include <cstdio>
                #include <cstdlib>
                #include <cstring>
                #include <cstdio>
                #include <cstdlib>
                #include <cstring>

-               #include <cstddef>

                #include <cstdint>
                #include <ctime>
                #include <fstream>
                #include <cstdint>
                #include <ctime>
                #include <fstream>

diff --git a/check/mul_eval_memleak.cpp b/check/mul_eval_memleak.cpp
index 7a349e8710806d5bc19288fce3327b80094c1fec..4ddc2e23786b61b6d47e8cdd0c5630342b53bdc4 100644 (file)
--- a/check/mul_eval_memleak.cpp
+++ b/check/mul_eval_memleak.cpp
@@ -96,7 +96,6 @@ g(1301*scale^(-1)))*eps^(-1)+F))\
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>

-#include <unistd.h>

 
 static void set_VM_limit(const unsigned long MB) {
        const unsigned mem_lim_kb = MB*1024*1024;
 
 static void set_VM_limit(const unsigned long MB) {
        const unsigned mem_lim_kb = MB*1024*1024;

diff --git a/check/timer.cpp b/check/timer.cpp
index 01a7c793e5d0ad332628ef9fff6ee20b5b1a4590..46d173f0205625a7f44bdc60367d078118592de0 100644 (file)
--- a/check/timer.cpp
+++ b/check/timer.cpp
@@ -22,7 +22,6 @@
 
 #ifdef HAVE_RUSAGE
 #include <sys/resource.h>
 
 #ifdef HAVE_RUSAGE
 #include <sys/resource.h>

-#include <unistd.h>

 #include <sys/time.h>
 #else
 #include <ctime>
 #include <sys/time.h>
 #else
 #include <ctime>

diff --git a/ginac/excompiler.cpp b/ginac/excompiler.cpp
index 6b1ae4cca7def3b219891ddd31ea3a9ff7be63ba..04920158a1140ddda3f1ec1a0cd191ea53bf04bb 100644 (file)
--- a/ginac/excompiler.cpp
+++ b/ginac/excompiler.cpp
@@ -36,10 +36,16 @@
 #include "symbol.h"
 
 #ifdef HAVE_LIBDL
 #include "symbol.h"
 
 #ifdef HAVE_LIBDL

-#include <dlfcn.h>
+# include <dlfcn.h>

 #endif // def HAVE_LIBDL
 #endif // def HAVE_LIBDL

-#include <unistd.h>
-#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#else
+# ifdef _MSC_VER
+#  include <io.h>  // for close(3)
+# endif // def _MSC_VER
+#endif // def HAVE_UNISTD_H
+#include <cstdlib>

 #include <fstream>
 #include <ios>
 #include <sstream>
 #include <fstream>
 #include <ios>
 #include <sstream>