From 814ab59c372cf4c71147636ea7d5cb3bace883c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 25 Sep 2023 15:14:29 +0200
Subject: [PATCH] Windows: Remove `MSVC` define redundant with `_MSC_VER`

Cleanup unused MSVC code in FileAccessUnix.
---
 drivers/unix/file_access_unix.cpp        | 17 -----------------
 drivers/windows/file_access_windows.cpp  |  1 +
 platform/windows/crash_handler_windows.h |  2 +-
 platform/windows/detect.py               |  1 -
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp
index d28e0e70b85b..ca5a13799e33 100644
--- a/drivers/unix/file_access_unix.cpp
+++ b/drivers/unix/file_access_unix.cpp
@@ -39,18 +39,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-
-#if defined(UNIX_ENABLED)
 #include <unistd.h>
-#endif
-
-#ifdef MSVC
-#define S_ISREG(m) ((m)&_S_IFREG)
-#include <io.h>
-#endif
-#ifndef S_ISREG
-#define S_ISREG(m) ((m)&S_IFREG)
-#endif
 
 void FileAccessUnix::check_errors() const {
 	ERR_FAIL_NULL_MSG(f, "File must be opened before use.");
@@ -279,16 +268,10 @@ bool FileAccessUnix::file_exists(const String &p_path) {
 		return false;
 	}
 
-#ifdef UNIX_ENABLED
 	// See if we have access to the file
 	if (access(filename.utf8().get_data(), F_OK)) {
 		return false;
 	}
-#else
-	if (_access(filename.utf8().get_data(), 4) == -1) {
-		return false;
-	}
-#endif
 
 	// See if this is a regular file
 	switch (st.st_mode & S_IFMT) {
diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp
index 98b0c358e808..9d21073f190a 100644
--- a/drivers/windows/file_access_windows.cpp
+++ b/drivers/windows/file_access_windows.cpp
@@ -34,6 +34,7 @@
 
 #include "core/os/os.h"
 #include "core/string/print_string.h"
+
 #include <share.h> // _SH_DENYNO
 #include <shlwapi.h>
 #define WIN32_LEAN_AND_MEAN
diff --git a/platform/windows/crash_handler_windows.h b/platform/windows/crash_handler_windows.h
index ef5831f10cfa..3871210977c1 100644
--- a/platform/windows/crash_handler_windows.h
+++ b/platform/windows/crash_handler_windows.h
@@ -35,7 +35,7 @@
 #include <windows.h>
 
 // Crash handler exception only enabled with MSVC
-#if defined(DEBUG_ENABLED) && defined(MSVC)
+#if defined(DEBUG_ENABLED) && defined(_MSC_VER)
 #define CRASH_HANDLER_EXCEPTION 1
 
 extern DWORD CrashHandlerException(EXCEPTION_POINTERS *ep);
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 340b95e4abda..7caa0153d7b2 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -385,7 +385,6 @@ def configure_msvc(env, vcvars_msvc_config):
             "WINMIDI_ENABLED",
             "TYPED_METHOD_BIND",
             "WIN32",
-            "MSVC",
             "WINVER=%s" % env["target_win_version"],
             "_WIN32_WINNT=%s" % env["target_win_version"],
         ]