TD-4088

src/os/inc/osDef.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#if defined(TD_DARWIN_64)
+#if defined(_TD_DARWIN_64)
   // specific
   typedef int(*__compar_fn_t)(const void *, const void *);
 
@@ -48,12 +48,6 @@ extern "C" {
   #endif
 #endif
 
-#if defined(_TD_ARM_32)
-  #define BUILDIN_CTZL(val) __builtin_ctzll(val)
-  #define BUILDIN_CLZ(val) __builtin_clz(val)
-  #define BUILDIN_CTZ(val) __builtin_ctz(val)
-#endif
-
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
   char *stpcpy (char *dest, const char *src);
   char *stpncpy (char *dest, const char *src, size_t n);

src/os/inc/osInc.h

@@ -72,7 +72,7 @@ extern "C" {
   #include <wordexp.h>
   #include <wctype.h>
 
-  #if defined(TD_DARWIN_64)
+  #if defined(_TD_DARWIN_64)
     #include <dispatch/dispatch.h>
     #include "osEok.h"
   #else

src/os/inc/osSocket.h

@@ -95,7 +95,9 @@ const char *taosInetNtoa(struct in_addr ipInt);
   #if defined(_TD_GO_DLL_)
     uint64_t htonll(uint64_t val);
   #endif
-#elif defined(_TD_DARWIN_64)
+#endif
+
+#if defined(_TD_DARWIN_64)
   #define htobe64 htonll
 #endif