From d6ed5fe096f7f6e63b45f8a676d956f4db482fc5 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Wed, 9 Aug 2023 20:08:19 +0800
Subject: [PATCH] fix: timezone and qsort for windows

---
 source/os/src/osMath.c     | 2 +-
 source/os/src/osTimezone.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/os/src/osMath.c b/source/os/src/osMath.c
index 0cff0f78a6..10d02ab25c 100644
--- a/source/os/src/osMath.c
+++ b/source/os/src/osMath.c
@@ -25,7 +25,7 @@ int32_t qsortHelper(const void* p1, const void* p2, const void* param) {
 
 // todo refactor: 1) move away; 2) use merge sort instead; 3) qsort is not a stable sort actually.
 void taosSort(void* base, int64_t sz, int64_t width, __compar_fn_t compar) {
-#if defined(WINDOWS) || defined(_ALPINE)
+#if defined(WINDOWS_STASH) || defined(_ALPINE)
   void* param = compar;
   taosqsort(base, sz, width, param, qsortHelper);
 #else
diff --git a/source/os/src/osTimezone.c b/source/os/src/osTimezone.c
index cd6ad7cdb5..4280490c68 100644
--- a/source/os/src/osTimezone.c
+++ b/source/os/src/osTimezone.c
@@ -768,7 +768,7 @@ void taosSetSystemTimezone(const char *inTimezoneStr, char *outTimezoneStr, int8
         keyValue[4] = (keyValue[4] == '+' ? '-' : '+');
         keyValue[10] = 0;
         sprintf(winStr, "TZ=%s:00", &(keyValue[1]));
-        *tsTimezone = taosStr2Int32(&keyValue[4], NULL, 10);
+        *tsTimezone = -taosStr2Int32(&keyValue[4], NULL, 10);
       }
       break;
     }
@@ -789,7 +789,7 @@ void taosSetSystemTimezone(const char *inTimezoneStr, char *outTimezoneStr, int8
         indexStr = ppp - pp + 3;
       }
       sprintf(&winStr[indexStr], "%c%c%c:%c%c:00", (p[0] == '+' ? '-' : '+'), p[1], p[2], p[3], p[4]);
-      *tsTimezone = taosStr2Int32(p, NULL, 10);
+      *tsTimezone = -taosStr2Int32(p, NULL, 10);
     } else {
       *tsTimezone = 0;
     }