From 0a3f5b65bff0fb9ad39e45ec514dd391a3775aac Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Thu, 11 May 2023 12:51:12 +0200
Subject: [PATCH] Fix last changes in io.cpp for msys2. - use the same code for
 msys2 and msvc - add an option to use a fallback for msys2 if the common code
 does not compile

---
 libs/kiplatform/msw/io.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libs/kiplatform/msw/io.cpp b/libs/kiplatform/msw/io.cpp
index 7a10c2c068..b91f5c61ec 100644
--- a/libs/kiplatform/msw/io.cpp
+++ b/libs/kiplatform/msw/io.cpp
@@ -14,19 +14,22 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License along
-* with this program.  If not, see <http://www.gnu.org/licenses/>.
+* with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 #include <kiplatform/io.h>
 
 #include <wx/string.h>
+#include <wx/wxcrt.h>
 
 #include <windows.h>
 
+// Define USE_MSYS2_FALlBACK if the code for _MSC_VER does not compile on msys2
+//#define  USE_MSYS2_FALLBACK
 
-FILE* KIPLATFORM::IO::SeqFOpen( const wxString& aPath, const wxString& mode )
+FILE* KIPLATFORM::IO::SeqFOpen( const wxString& aPath, const wxString& aMode )
 {
-#ifdef _MSC_VER
+#if defined( _MSC_VER ) || !defined( USE_MSYS2_FALLBACK )
     // We need to use the win32 api to setup a file handle with sequential scan flagged
     // and pass it up the chain to create a normal FILE stream
     HANDLE hFile = INVALID_HANDLE_VALUE;
@@ -52,7 +55,7 @@ FILE* KIPLATFORM::IO::SeqFOpen( const wxString& aPath, const wxString& mode )
         return NULL;
     }
 
-    FILE* fp = _fdopen( fd, mode.c_str() );
+    FILE* fp = _fdopen( fd, aMode.c_str() );
 
     if( !fp )
     {