[GRASS-SVN] r70987 - grass-addons/grass7/raster/r.sim.water.mp

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2017-04-29 12:17:49 -0700 (Sat, 29 Apr 2017)
New Revision: 70987

Modified:
   grass-addons/grass7/raster/r.sim.water.mp/main.c
   grass-addons/grass7/raster/r.sim.water.mp/simlib.h
Log:
r.sim.water.mp: define module/file global vars once in a file (fixes: multiple definition of threads)

Modified: grass-addons/grass7/raster/r.sim.water.mp/main.c
===================================================================
--- grass-addons/grass7/raster/r.sim.water.mp/main.c	2017-04-29 19:09:52 UTC (rev 70986)
+++ grass-addons/grass7/raster/r.sim.water.mp/main.c	2017-04-29 19:17:49 UTC (rev 70987)
@@ -99,6 +99,10 @@
 
 #ifdef PARALLEL
 
+int threads;
+
+time_t timer;
+
 void printTimeDiff(const char* message)
 {
 	double seconds;

Modified: grass-addons/grass7/raster/r.sim.water.mp/simlib.h
===================================================================
--- grass-addons/grass7/raster/r.sim.water.mp/simlib.h	2017-04-29 19:09:52 UTC (rev 70986)
+++ grass-addons/grass7/raster/r.sim.water.mp/simlib.h	2017-04-29 19:17:49 UTC (rev 70987)
@@ -99,10 +99,6 @@
 
 #ifdef PARALLEL
 
-int threads;
-
-time_t timer;
-
 void printTimeDiff(const char* message);
 
 struct options