[TD-992]

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)

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");

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
 

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);

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) {

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

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);