xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #983 from taosdata/beta/v1.6.5.1 

develop branch fails to compile on windows platform
This commit is contained in:
plum-lihui 2019-12-21 17:14:37 +08:00 committed by GitHub
parent 3cd3ff0483 7286056fba
commit b1adc3f9e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/os/windows/inc/os.h
View File

@ -37,7 +37,8 @@
#include <signal.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <time.h>
#include <time.h>
#include <inttypes.h>
#include "winsock2.h"
#include <WS2tcpip.h>

1
src/util/CMakeLists.txt
View File

@ -57,7 +57,6 @@ ELSEIF (TD_WINDOWS_64)
LIST(APPEND SRC ./src/tsched.c)
LIST(APPEND SRC ./src/tskiplist.c)
LIST(APPEND SRC ./src/tsocket.c)
LIST(APPEND SRC ./src/tstatus.c)
LIST(APPEND SRC ./src/tstrbuild.c)
LIST(APPEND SRC ./src/ttime.c)
LIST(APPEND SRC ./src/ttimer.c)

8
src/util/src/version.c
View File

@ -1,5 +1,5 @@
char version[64] = "1.6.4.4";
char version[64] = "1.6.5.1";
char compatible_version[64] = "1.6.1.0";
char gitinfo[128] = "d62c5c30231d04a736d437cf428af6e12599bd9f";
char gitinfoOfInternal[128] = "8094a32d78dc519bd883d01ac2ba6ec49ac57a80";
char buildinfo[512] = "Built by ubuntu at 2019-12-16 21:40";
char gitinfo[128] = "2ea714387009421beb35e7f03b94c6a87d22529a";
char gitinfoOfInternal[128] = "950f54ac026bc05bcec5cff356f4964a18d635bd";
char buildinfo[512] = "Built by ubuntu at 2019-12-21 11:14";