From d59ceb7ba2ec997c9e85c0590f61fbbd82813a0a Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Fri, 31 Jul 2020 16:12:55 +0800
Subject: [PATCH] [TD-992]

---
 src/os/CMakeLists.txt              | 6 +++---
 src/os/src/darwin/darwinEnv.c      | 1 -
 src/os/src/darwin/darwinFile.c     | 6 ------
 src/os/src/darwin/darwinSemphone.c | 7 -------
 src/os/src/darwin/darwinSocket.c   | 7 -------
 src/os/src/darwin/darwinSysInfo.c  | 6 +-----
 src/os/src/darwin/darwinTimer.c    | 7 -------
 7 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index a8664669d0..b4ad4ad915 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -6,11 +6,11 @@ IF (TD_LINUX_64)
 ELSEIF (TD_LINUX_32)
   ADD_SUBDIRECTORY(src/linux32)
 ELSEIF (TD_DARWIN_64)
-  ADD_SUBDIRECTORY(src/darwin64)  
+  ADD_SUBDIRECTORY(src/darwin)  
 ELSEIF (TD_WINDOWS_64)
-  ADD_SUBDIRECTORY(src/windows64)
+  ADD_SUBDIRECTORY(src/windows)
 ELSEIF (TD_WINDOWS_32)
-  ADD_SUBDIRECTORY(src/windows32)
+  ADD_SUBDIRECTORY(src/windows)
 ENDIF ()
 
 ADD_SUBDIRECTORY(src/detail)
diff --git a/src/os/src/darwin/darwinEnv.c b/src/os/src/darwin/darwinEnv.c
index 71df78c923..7e1031a5af 100644
--- a/src/os/src/darwin/darwinEnv.c
+++ b/src/os/src/darwin/darwinEnv.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobal.h"
-#include "tulog.h"
 
 void osInit() {
   strcpy(configDir, "~/TDengine/cfg");
diff --git a/src/os/src/darwin/darwinFile.c b/src/os/src/darwin/darwinFile.c
index 113ea7f1fa..66bdb5b939 100644
--- a/src/os/src/darwin/darwinFile.c
+++ b/src/os/src/darwin/darwinFile.c
@@ -15,13 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
 #include "tulog.h"
-#include "tutil.h"
 
 #define _SEND_FILE_STEP_ 1000
 
diff --git a/src/os/src/darwin/darwinSemphone.c b/src/os/src/darwin/darwinSemphone.c
index 71571c8ba5..97ff543789 100644
--- a/src/os/src/darwin/darwinSemphone.c
+++ b/src/os/src/darwin/darwinSemphone.c
@@ -15,13 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
-#include "tulog.h"
-#include "tutil.h"
 
 int tsem_init(dispatch_semaphore_t *sem, int pshared, unsigned int value) {
   *sem = dispatch_semaphore_create(value);
diff --git a/src/os/src/darwin/darwinSocket.c b/src/os/src/darwin/darwinSocket.c
index 32832b9d63..e51f2c4fba 100644
--- a/src/os/src/darwin/darwinSocket.c
+++ b/src/os/src/darwin/darwinSocket.c
@@ -15,13 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
-#include "tulog.h"
-#include "tutil.h"
 
 int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen) {
   if (level == SOL_SOCKET && optname == SO_SNDBUF) {
diff --git a/src/os/src/darwin/darwinSysInfo.c b/src/os/src/darwin/darwinSysInfo.c
index ee2f82b307..108cc6239f 100644
--- a/src/os/src/darwin/darwinSysInfo.c
+++ b/src/os/src/darwin/darwinSysInfo.c
@@ -15,13 +15,9 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
 #include "tconfig.h"
-#include "ttimer.h"
+#include "tglobal.h"
 #include "tulog.h"
-#include "tutil.h"
 
 static void taosGetSystemTimezone() {
   // get and set default timezone
diff --git a/src/os/src/darwin/darwinTimer.c b/src/os/src/darwin/darwinTimer.c
index 93546088f3..5fe65fb99e 100644
--- a/src/os/src/darwin/darwinTimer.c
+++ b/src/os/src/darwin/darwinTimer.c
@@ -15,13 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
-#include "tulog.h"
-#include "tutil.h"
 
 int taosInitTimer(void (*callback)(int), int ms) {
   signal(SIGALRM, callback);
-- 
GitLab