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

Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os

This commit is contained in:
Shengliang Guan 2020-08-06 18:43:50 +08:00
parent 9744ac5fc8 1dc751200a
commit b750ab1ef3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/inc/osMath.h
View File

@ -21,7 +21,7 @@ extern "C" {
#endif
#define POW2(x) ((x) * (x))
#define ABS(x) ((x) > 0 ? (x) : (-x))
#define ABS(x) ((x) > 0 ? (x) : -(x))
#ifndef TAOS_OS_FUNC_MATH
#define SWAP(a, b, c) \

2
src/query/CMakeLists.txt
View File

@ -10,7 +10,7 @@ ADD_LIBRARY(query ${SRC})
SET_SOURCE_FILES_PROPERTIES(src/sql.c PROPERTIES COMPILE_FLAGS -w)
IF (TD_LINUX)
TARGET_LINK_LIBRARIES(query tutil m rt)
TARGET_LINK_LIBRARIES(query tsdb tutil m rt)
ADD_SUBDIRECTORY(tests)
ELSEIF (TD_WINDOWS)
TARGET_LINK_LIBRARIES(query tutil)