Mac compatibility fix (malloc.h)

divine/report.h

@@ -17,7 +17,7 @@
 
 #ifdef HAVE_MPI
 #include <mpi.h>
-#ifdef OPEN_MPI
+#if defined(OPEN_MPI) && !defined(__APPLE__)
 #include <ompi/version.h>
 #endif
 #endif

wibble/sys/exec.cpp

@@ -22,7 +22,9 @@
 
 #include <string.h>			// strdup
 #include <unistd.h>			// execve
+#ifndef __APPLE__
 #include <malloc.h> // alloca on win32 seems to live there
+#endif
 #include <iostream>
 
 extern char **environ;

wibble/sys/fs.cpp

@@ -5,7 +5,9 @@
 #include <fstream>
 #include <sys/stat.h>
 #include <errno.h>
+#ifndef __APPLE__
 #include <malloc.h> // alloca on win32 seems to live there
+#endif
 
 namespace wibble {
 namespace sys {