Merge branch 'main' into veroandreo-patch-1

OSGeo · May 14, 2024 · 26c777c · 26c777c
2 parents 66d98b1 + 0ec833c
commit 26c777c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/raster/r.flow/io.c → raster/r.flow/flow_io.c b/raster/r.flow/io.c → raster/r.flow/flow_io.c
diff --git a/raster/r.flow/io.h → raster/r.flow/flow_io.h b/raster/r.flow/io.h → raster/r.flow/flow_io.h
diff --git a/raster/r.flow/main.c b/raster/r.flow/main.c
@@ -32,7 +32,7 @@
 #include <grass/glocale.h>
 #include "r.flow.h"
 #include "mem.h"
-#include "io.h"
+#include "flow_io.h"
 #include "aspect.h"
 #include "precomp.h"
 

diff --git a/raster/r.flow/mem.c b/raster/r.flow/mem.c
@@ -28,7 +28,7 @@
 #include <grass/raster.h>
 #include <grass/glocale.h>
 #include "r.flow.h"
-#include "io.h"
+#include "flow_io.h"
 #include "mem.h"
 
 /************************** MEMORY MGMT/ACCESS **************************/

diff --git a/raster/r.flow/precomp.c b/raster/r.flow/precomp.c
@@ -28,7 +28,7 @@
 #include <grass/raster.h>
 #include <grass/glocale.h>
 #include "r.flow.h"
-#include "io.h"
+#include "flow_io.h"
 #include "mem.h"
 #include "aspect.h"