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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit fb23b9704dcbeedc7abceadf6fd757dabaa49cde
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Feb 26 13:28:02 2009 +1100

    Fixed obsolete lseek() call in RStarTree
    
    darcs-hash:20090226022802-d4795-b479706435e18debae62a7af67fd87a14eaf2eeb.gz

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 22c81dd..f96b9d0 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -63,14 +63,17 @@ libmap2D3_la_LIBADD = -lproj
 
 libterrain3D_la_SOURCES = terrain.c rsurface.c rsurface.h
 libterrain3D_la_LIBADD = -LRStarTree -lcSmRST
+libterrain3D_la_DEPENDENCIES = RStarTree/libcSmRST.a
 
 libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
 libterrain2D_la_SOURCES = terrain.c rsurface.c rsurface.h
 libterrain2D_la_LIBADD = -LRStarTree -lcSmRST
+libterrain2D_la_DEPENDENCIES = RStarTree/libcSmRST.a
 
 libterrain2D3_la_SOURCES = terrain.c rsurface.c rsurface.h
 libterrain2D3_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D3=1
 libterrain2D3_la_LIBADD = -LRStarTree -lcSmRST
+libterrain2D3_la_DEPENDENCIES = RStarTree/libcSmRST.a
 
 libtide3D_la_SOURCES = tide.c
 libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
@@ -95,14 +98,17 @@ libwavewatch2D_la_DEPENDENCIES = wavewatch/libwavewatch.a
 xyz2rsurface_SOURCES = xyz2rsurface.c rsurface.c rsurface.h
 xyz2rsurface_LDADD = -LRStarTree -lcSmRST
 xyz2rsurface_CFLAGS = $(AM_CFLAGS)
+xyz2rsurface_DEPENDENCIES = RStarTree/libcSmRST.a
 
 rsurfacequery_SOURCES = rsurfacequery.c rsurface.c rsurface.h
 rsurfacequery_LDADD = -LRStarTree -lcSmRST
 rsurfacequery_CFLAGS = $(AM_CFLAGS)
+rsurfacequery_DEPENDENCIES = RStarTree/libcSmRST.a
 
 rsurfacedraw_SOURCES = rsurfacedraw.c rsurface.c rsurface.h
 rsurfacedraw_LDADD = -LRStarTree -lcSmRST
 rsurfacedraw_CFLAGS = $(AM_CFLAGS)
+rsurfacedraw_DEPENDENCIES = RStarTree/libcSmRST.a
 
 if HAVE_MODULES
 %.c : %.mod
diff --git a/modules/RStarTree/RSTInOut.c b/modules/RStarTree/RSTInOut.c
index 22eed0f..df60485 100644
--- a/modules/RStarTree/RSTInOut.c
+++ b/modules/RStarTree/RSTInOut.c
@@ -93,7 +93,7 @@ void ReadPage(RSTREE R,
 {
   int pnb; /* position or nbytes */
   
-  pnb= lseek(fd.f,(off_t)pagenr*(off_t)fd.bl,L_SET);
+  pnb= lseek(fd.f,(off_t)pagenr*(off_t)fd.bl,SEEK_SET);
   if (pnb != -1) {
     pnb= read(fd.f,block,fd.bl);
   }
@@ -112,7 +112,7 @@ void WritePage(RSTREE R,
 {
   int pnb; /* position or nbytes */
   
-  pnb= lseek(fd.f,(off_t)pagenr*(off_t)fd.bl,L_SET);
+  pnb= lseek(fd.f,(off_t)pagenr*(off_t)fd.bl,SEEK_SET);
   if (pnb != -1) {
     pnb= write(fd.f,block,fd.bl);
   }
diff --git a/modules/RStarTree/trst.c b/modules/RStarTree/trst.c
index 7d4997c..2cdae0b 100644
--- a/modules/RStarTree/trst.c
+++ b/modules/RStarTree/trst.c
@@ -495,7 +495,7 @@ void GetTestParameters(File file, char *name)
   if (end == 0) {
     end= GetLOF(file) / sizeof(data);
   }
-  pos= lseek(file,begin*sizeof(data),L_SET);
+  pos= lseek(file,begin*sizeof(data),SEEK_SET);
   if (pos == -1) {
     DisplErr(name);
   }

-- 
Gerris Flow Solver