From 84478f28fff21aa2eb046524958ce0e8d578828e Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Tue, 14 Jun 2022 12:11:42 -0500
Subject: [PATCH 1/2] remove duplicate timezone define

---
 ports/win32/bacport.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/win32/bacport.h b/ports/win32/bacport.h
index 0348875d..8557bf66 100644
--- a/ports/win32/bacport.h
+++ b/ports/win32/bacport.h
@@ -70,12 +70,6 @@ and globals in favor of more secure versions.  */
 #endif
 #include <sys/timeb.h>
 
-#if defined(__BORLANDC__) || defined(_WIN32)
-/* seems to not be defined in time.h as specified by The Open Group */
-/* difference from UTC and local standard time  */
-long int timezone;
-#endif
-
 #ifdef _MSC_VER
 #define inline __inline
 #endif

From 741530ef8acb26ab2276b3178af6cd80048b5736 Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Tue, 14 Jun 2022 12:13:36 -0500
Subject: [PATCH 2/2] remove unnecessary bacport.h dependency

---
 src/bacnet/basic/object/client/device-client.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bacnet/basic/object/client/device-client.c b/src/bacnet/basic/object/client/device-client.c
index a4a27c04..a76170ce 100644
--- a/src/bacnet/basic/object/client/device-client.c
+++ b/src/bacnet/basic/object/client/device-client.c
@@ -32,7 +32,6 @@
 #include <stdint.h>
 #include <string.h> /* for memmove */
 /* OS specific include*/
-#include "bacport.h"
 #include "bacnet/basic/sys/mstimer.h"
 /* BACnet includes */
 #include "bacnet/bacdef.h"