From 02a1c0d0829e2714e9c799e791d69c49b9521cf4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 7 Jan 2024 23:51:21 +0100
Subject: [PATCH] Only test for _WIN32 for Windows detection

---
 dbfopen.c   | 4 ++--
 sbnsearch.c | 2 +-
 shapefil.h  | 2 +-
 shpopen.c   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dbfopen.c b/dbfopen.c
index ee5be97..c90defc 100644
--- a/dbfopen.c
+++ b/dbfopen.c
@@ -26,7 +26,7 @@
 
 #if defined(_MSC_VER)
 #define STRCASECMP(a, b) (_stricmp(a, b))
-#elif defined(WIN32) || defined(_WIN32)
+#elif defined(_WIN32)
 #define STRCASECMP(a, b) (stricmp(a, b))
 #else
 #include <strings.h>
@@ -37,7 +37,7 @@
 #if _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
-#elif defined(WIN32) || defined(_WIN32)
+#elif defined(_WIN32)
 #ifndef snprintf
 #define snprintf _snprintf
 #endif
diff --git a/sbnsearch.c b/sbnsearch.c
index 6c4a6af..75bd179 100644
--- a/sbnsearch.c
+++ b/sbnsearch.c
@@ -24,7 +24,7 @@
 #if _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
-#elif defined(WIN32) || defined(_WIN32)
+#elif defined(_WIN32)
 #ifndef snprintf
 #define snprintf _snprintf
 #endif
diff --git a/shapefil.h b/shapefil.h
index 2328f15..e499818 100644
--- a/shapefil.h
+++ b/shapefil.h
@@ -112,7 +112,7 @@ extern "C"
 /*      On some platforms, additional file IO hooks are defined that    */
 /*      UTF-8 encoded filenames Unicode filenames                       */
 /* -------------------------------------------------------------------- */
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#if defined(_WIN32)
 #define SHPAPI_WINDOWS
 #define SHPAPI_UTF8_HOOKS
 #endif
diff --git a/shpopen.c b/shpopen.c
index 2cf982d..3b696af 100644
--- a/shpopen.c
+++ b/shpopen.c
@@ -39,7 +39,7 @@
 #if _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
-#elif defined(WIN32) || defined(_WIN32)
+#elif defined(_WIN32)
 #ifndef snprintf
 #define snprintf _snprintf
 #endif