[GRASS-SVN] r40272 - in grass/trunk/raster/simwe: r.sim.sediment r.sim.water simlib

[svn_grass at osgeo.org]

Author: huhabla
Date: 2010-01-05 19:41:59 -0500 (Tue, 05 Jan 2010)
New Revision: 40272

Modified:
   grass/trunk/raster/simwe/r.sim.sediment/Makefile
   grass/trunk/raster/simwe/r.sim.sediment/main.c
   grass/trunk/raster/simwe/r.sim.water/Makefile
   grass/trunk/raster/simwe/r.sim.water/main.c
   grass/trunk/raster/simwe/simlib/waterglobs.h
Log:
Errors while compiling fixed

Modified: grass/trunk/raster/simwe/r.sim.sediment/Makefile
===================================================================
--- grass/trunk/raster/simwe/r.sim.sediment/Makefile	2010-01-06 00:26:29 UTC (rev 40271)
+++ grass/trunk/raster/simwe/r.sim.sediment/Makefile	2010-01-06 00:41:59 UTC (rev 40272)
@@ -5,9 +5,10 @@
 EXTRA_CLEAN_DIRS=doxygenhtml
 
 LIBES     = $(SIMLIB) $(BITMAPLIB) $(LINKMLIB) \
-            $(SITESLIB) $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB) $(DATETIMELIB) $(GMATHLIB)
+            $(SITESLIB) $(VECTLIB) $(VECTLIB_REAL) \
+            $(DBMILIB) $(GISLIB) $(DATETIMELIB) $(GMATHLIB) $(RASTERLIB)
 DEPENDENCIES = $(SIMDEP) $(BITMAPDEP) $(LINKMDEP) \
-            $(VECTDEP) $(DBMIDEP) $(GISDEP) $(DATETIMEDEP) $(GMATHDEP)
+            $(VECTDEP) $(DBMIDEP) $(GISDEP) $(DATETIMEDEP) $(GMATHDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = -I ../simlib $(VECT_CFLAGS) 
 

Modified: grass/trunk/raster/simwe/r.sim.sediment/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.sediment/main.c	2010-01-06 00:26:29 UTC (rev 40271)
+++ grass/trunk/raster/simwe/r.sim.sediment/main.c	2010-01-06 00:41:59 UTC (rev 40272)
@@ -255,8 +255,7 @@
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (G_get_set_window(&cellhd) == -1)
-	exit(EXIT_FAILURE);
+    G_get_set_window(&cellhd);
 
     conv = G_database_units_to_meters_factor();
 

Modified: grass/trunk/raster/simwe/r.sim.water/Makefile
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/Makefile	2010-01-06 00:26:29 UTC (rev 40271)
+++ grass/trunk/raster/simwe/r.sim.water/Makefile	2010-01-06 00:41:59 UTC (rev 40272)
@@ -5,9 +5,9 @@
 EXTRA_CLEAN_DIRS=doxygenhtml
 
 LIBES     = $(SIMLIB) $(BITMAPLIB) $(LINKMLIB) \
-            $(SITESLIB) $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB) $(DATETIMELIB) $(GMATHLIB)
+            $(SITESLIB) $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB) $(DATETIMELIB) $(GMATHLIB) $(RASTERLIB)
 DEPENDENCIES = $(SIMDEP) $(BITMAPDEP) $(LINKMDEP) \
-            $(VECTDEP) $(DBMIDEP) $(GISDEP) $(DATETIMEDEP) $(GMATHDEP)
+            $(VECTDEP) $(DBMIDEP) $(GISDEP) $(DATETIMEDEP) $(GMATHDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = -I ../simlib $(VECT_CFLAGS) 
 

Modified: grass/trunk/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/main.c	2010-01-06 00:26:29 UTC (rev 40271)
+++ grass/trunk/raster/simwe/r.sim.water/main.c	2010-01-06 00:41:59 UTC (rev 40272)
@@ -303,8 +303,7 @@
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (G_get_set_window(&cellhd) == -1)
-	exit(EXIT_FAILURE);
+    G_get_set_window(&cellhd);
 
     conv = G_database_units_to_meters_factor();
 

Modified: grass/trunk/raster/simwe/simlib/waterglobs.h
===================================================================
--- grass/trunk/raster/simwe/simlib/waterglobs.h	2010-01-06 00:26:29 UTC (rev 40271)
+++ grass/trunk/raster/simwe/simlib/waterglobs.h	2010-01-06 00:41:59 UTC (rev 40272)
@@ -11,6 +11,8 @@
 #define GLOBAL extern
 #endif
 
+#include <grass/raster.h>
+
 /*
 GLOBAL FILE *fdelevin, *fddxin, *fddyin, *fdrain, *fdinfil, *fdtraps,
     *fdmanin, *fddepth, *fddisch, *fderr, *fdoutwalk, *fdwalkers;