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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 61ae7a78e7e4945835a35f6b6b53a644e72e2c57
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Apr 23 07:30:25 2008 +1000

    Minor changes to RStarTree (updated header files etc...)
    
    darcs-hash:20080422213025-d4795-ec1ae60a905aec36285bc232e0e8b5fa7b651751.gz

diff --git a/AUTHORS b/AUTHORS
index e763d99..3089550 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,3 +10,4 @@ Ruben Scardovelli: - author of the Fortran version of gfs_plane_alpha()
 Ivan Adam Vari: RPM packages.
 Daniel Fuster: gfsjoin script
 Rohallah Tavakoli: initial implementation of VTK and Tecplot output
+Norbert Beckmann: R*-tree implementation used in the terrain module
diff --git a/modules/RStarTree/RStarTree.c b/modules/RStarTree/RStarTree.c
index ed17cb7..5fc4bc6 100644
--- a/modules/RStarTree/RStarTree.c
+++ b/modules/RStarTree/RStarTree.c
@@ -1,5 +1,6 @@
 /* ----- RStarTree.c ----- */
 
+#include <stdlib.h>
 
 #include "RStarTree.h"
 #include "RSTInterUtil.h"
diff --git a/modules/RStarTree/RStarTree.h b/modules/RStarTree/RStarTree.h
index e9d13d2..0ed6e70 100644
--- a/modules/RStarTree/RStarTree.h
+++ b/modules/RStarTree/RStarTree.h
@@ -34,13 +34,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#ifdef SVR4
-#  include <fcntl.h>
-#  include <sys/fcntl.h>
-#else
-#  include <sys/fcntlcom.h>
-#  include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 
 
 /* ----------------------------- constants ----------------------------- */
@@ -83,7 +77,7 @@ typedef typinterval  typrect[NumbOfDim];
 
 
 typedef struct {
-               int  contents; /**V**/
+               float height;
                } typinfo, *refinfo;
 
         /* A typinfo is a struct which may contain arbitrary information

-- 
Gerris Flow Solver