From 0ec833ce53f7227dab55cb0f7d9090af7ebe898d Mon Sep 17 00:00:00 2001 From: Nicklas Larsson Date: Tue, 14 May 2024 13:11:12 +0200 Subject: [PATCH] r.flow: rename io.h file which causes conflict with MSYS2 (#3708) Closes: https://github.com/OSGeo/grass/issues/3700 --- raster/r.flow/{io.c => flow_io.c} | 0 raster/r.flow/{io.h => flow_io.h} | 0 raster/r.flow/main.c | 2 +- raster/r.flow/mem.c | 2 +- raster/r.flow/precomp.c | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename raster/r.flow/{io.c => flow_io.c} (100%) rename raster/r.flow/{io.h => flow_io.h} (100%) diff --git a/raster/r.flow/io.c b/raster/r.flow/flow_io.c similarity index 100% rename from raster/r.flow/io.c rename to raster/r.flow/flow_io.c diff --git a/raster/r.flow/io.h b/raster/r.flow/flow_io.h similarity index 100% rename from raster/r.flow/io.h rename to raster/r.flow/flow_io.h diff --git a/raster/r.flow/main.c b/raster/r.flow/main.c index 791cd9350c0..bb8c3a6d6b4 100644 --- a/raster/r.flow/main.c +++ b/raster/r.flow/main.c @@ -32,7 +32,7 @@ #include #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 index 44f24e55649..4dbe818bc11 100644 --- a/raster/r.flow/mem.c +++ b/raster/r.flow/mem.c @@ -28,7 +28,7 @@ #include #include #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 index 36d5678a8c2..eac8ca3f1fa 100644 --- a/raster/r.flow/precomp.c +++ b/raster/r.flow/precomp.c @@ -28,7 +28,7 @@ #include #include #include "r.flow.h" -#include "io.h" +#include "flow_io.h" #include "mem.h" #include "aspect.h"