[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit aa536a81cb60fc4fb1fc421b6bc8b3557a562599
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sun Oct 5 12:48:59 2008 +1100

    Fixed headers for compilation on Mac OSX
    
    darcs-hash:20081005014859-d4795-41d6dff20104045da2feab019d40d296f0b98b19.gz

diff --git a/modules/RStarTree/RStarTree.h b/modules/RStarTree/RStarTree.h
index 0ed6e70..eb55ef0 100644
--- a/modules/RStarTree/RStarTree.h
+++ b/modules/RStarTree/RStarTree.h
@@ -27,10 +27,9 @@
 #include <stddef.h>
 #include <sys/file.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <values.h>
 #include <errno.h>
 #include <sys/stat.h>
 
diff --git a/modules/fes2004/fes2004_lib.h b/modules/fes2004/fes2004_lib.h
index 00d0b30..dde064d 100644
--- a/modules/fes2004/fes2004_lib.h
+++ b/modules/fes2004/fes2004_lib.h
@@ -14,7 +14,6 @@
 #include <math.h>
 #include <string.h>   
 #include <strings.h>
-#include <malloc.h>
 
 // standard multithread include //
 //#include <pthread.h>
diff --git a/modules/rsurface.c b/modules/rsurface.c
index 82bf601..f26d41a 100644
--- a/modules/rsurface.c
+++ b/modules/rsurface.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
 #include "RStarTree/RStarTree.h"
 #include "rsurface.h"
 

-- 
Gerris Flow Solver