From 851d10bc022c041b245435231a35746eae69b1ee Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Thu, 8 Feb 2024 14:54:17 -0600
Subject: [PATCH] Move some platform compile fixes into platform.h file

---
 ports/win32/bacport.h           | 5 -----
 src/bacnet/basic/sys/platform.h | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/win32/bacport.h b/ports/win32/bacport.h
index 2fef8c01..73b31207 100644
--- a/ports/win32/bacport.h
+++ b/ports/win32/bacport.h
@@ -76,11 +76,6 @@ and globals in favor of more secure versions.  */
 #define inline __inline
 #endif
 
-#ifdef _WIN32
-#define strncasecmp(x, y, z) _strnicmp(x, y, z)
-#define snprintf _snprintf
-#endif
-
 BACNET_STACK_EXPORT
 extern int bip_get_local_netmask(
     struct in_addr *netmask);
diff --git a/src/bacnet/basic/sys/platform.h b/src/bacnet/basic/sys/platform.h
index fb2736e2..1b483089 100644
--- a/src/bacnet/basic/sys/platform.h
+++ b/src/bacnet/basic/sys/platform.h
@@ -40,8 +40,10 @@
 #   define BACNET_STACK_DEPRECATED(message)
 # endif
 
-# if defined(WIN32) || defined(WIN64)
-#  define strcasecmp _stricmp
+#if defined(WIN32) || defined(WIN64)
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#define snprintf _snprintf
 #elif defined(__ZEPHYR__)
 #  include <strings.h>
 # endif