Skip to content

T
TDengine

~笨蛋陪你哭 / TDengine
与 Fork 源项目一致

Fork自 taosdata / TDengine

通知 1
Star 1
Fork 0
T
TDengine

体验新版 GitCode，发现更多精彩内容 >>

提交 8c466920 编写于 作者: S Shengliang Guan
浏览文件
操作

TD-1037

上级 a9899065
显示空白变更内容
内联 并排
Showing with 366 addition and 350 deletion
deps/CMakeLists.txt
浏览文件 @ 8c466920
...@@ -7,6 +7,7 @@ ADD_SUBDIRECTORY(regex) ...@@ -7,6 +7,7 @@ ADD_SUBDIRECTORY(regex)
ADD_SUBDIRECTORY(iconv) ADD_SUBDIRECTORY(iconv)
ADD_SUBDIRECTORY(lz4) ADD_SUBDIRECTORY(lz4)
ADD_SUBDIRECTORY(cJson) ADD_SUBDIRECTORY(cJson)
#ADD_SUBDIRECTORY(MsvcLibX)
IF (NOT TD_WINDOWS) IF (NOT TD_WINDOWS)
ADD_SUBDIRECTORY(MQTT-C) ADD_SUBDIRECTORY(MQTT-C)
......
deps/iconv/CMakeLists.txt
浏览文件 @ 8c466920
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(TDengine) PROJECT(TDengine)
IF (TD_WINDOWS_64) IF (TD_WINDOWS)
LIST(APPEND SRC iconv.c) LIST(APPEND SRC iconv.c)
LIST(APPEND SRC localcharset.c) LIST(APPEND SRC localcharset.c)
INCLUDE_DIRECTORIES(.) INCLUDE_DIRECTORIES(.)
......
deps/pthread/CMakeLists.txt
浏览文件 @ 8c466920
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(TDengine) PROJECT(TDengine)
IF (TD_WINDOWS_64) IF (TD_WINDOWS)
INCLUDE_DIRECTORIES(.) INCLUDE_DIRECTORIES(.)
LIST(APPEND SRC pthread.c) LIST(APPEND SRC pthread.c)
ADD_LIBRARY(pthread ${SRC}) ADD_LIBRARY(pthread ${SRC})
......
deps/regex/CMakeLists.txt
浏览文件 @ 8c466920
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(TDengine) PROJECT(TDengine)
IF (TD_WINDOWS_64) IF (TD_WINDOWS)
INCLUDE_DIRECTORIES(inc .) INCLUDE_DIRECTORIES(inc .)
LIST(APPEND SRC regex.c) LIST(APPEND SRC regex.c)
ADD_LIBRARY(regex ${SRC}) ADD_LIBRARY(regex ${SRC})
......
deps/zlib-1.2.11/CMakeLists.txt
浏览文件 @ 8c466920
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(TDengine) PROJECT(TDengine)
IF (TD_LINUX_64) IF (TD_LINUX_64 OR TD_WINDOWS_64)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY(src SRC) AUX_SOURCE_DIRECTORY(src SRC)
ADD_LIBRARY(z ${SRC}) ADD_LIBRARY(z ${SRC})
......
deps/zlib-1.2.11/inc/zconf.h
浏览文件 @ 8c466920
...@@ -15,176 +15,176 @@ ...@@ -15,176 +15,176 @@
* this permanently in zconf.h using "./configure --zprefix". * this permanently in zconf.h using "./configure --zprefix".
*/ */
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET #define Z_PREFIX_SET
/* all linked symbols and init macros */ /* all linked symbols and init macros */
# define _dist_code z__dist_code #define _dist_code z__dist_code
# define _length_code z__length_code #define _length_code z__length_code
# define _tr_align z__tr_align #define _tr_align z__tr_align
# define _tr_flush_bits z__tr_flush_bits #define _tr_flush_bits z__tr_flush_bits
# define _tr_flush_block z__tr_flush_block #define _tr_flush_block z__tr_flush_block
# define _tr_init z__tr_init #define _tr_init z__tr_init
# define _tr_stored_block z__tr_stored_block #define _tr_stored_block z__tr_stored_block
# define _tr_tally z__tr_tally #define _tr_tally z__tr_tally
# define adler32 z_adler32 #define adler32 z_adler32
# define adler32_combine z_adler32_combine #define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64 #define adler32_combine64 z_adler32_combine64
# define adler32_z z_adler32_z #define adler32_z z_adler32_z
# ifndef Z_SOLO #ifndef Z_SOLO
# define compress z_compress #define compress z_compress
# define compress2 z_compress2 #define compress2 z_compress2
# define compressBound z_compressBound #define compressBound z_compressBound
# endif #endif
# define crc32 z_crc32 #define crc32 z_crc32
# define crc32_combine z_crc32_combine #define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64 #define crc32_combine64 z_crc32_combine64
# define crc32_z z_crc32_z #define crc32_z z_crc32_z
# define deflate z_deflate #define deflate z_deflate
# define deflateBound z_deflateBound #define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy #define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd #define deflateEnd z_deflateEnd
# define deflateGetDictionary z_deflateGetDictionary #define deflateGetDictionary z_deflateGetDictionary
# define deflateInit z_deflateInit #define deflateInit z_deflateInit
# define deflateInit2 z_deflateInit2 #define deflateInit2 z_deflateInit2
# define deflateInit2_ z_deflateInit2_ #define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_ #define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams #define deflateParams z_deflateParams
# define deflatePending z_deflatePending #define deflatePending z_deflatePending
# define deflatePrime z_deflatePrime #define deflatePrime z_deflatePrime
# define deflateReset z_deflateReset #define deflateReset z_deflateReset
# define deflateResetKeep z_deflateResetKeep #define deflateResetKeep z_deflateResetKeep
# define deflateSetDictionary z_deflateSetDictionary #define deflateSetDictionary z_deflateSetDictionary
# define deflateSetHeader z_deflateSetHeader #define deflateSetHeader z_deflateSetHeader
# define deflateTune z_deflateTune #define deflateTune z_deflateTune
# define deflate_copyright z_deflate_copyright #define deflate_copyright z_deflate_copyright
# define get_crc_table z_get_crc_table #define get_crc_table z_get_crc_table
# ifndef Z_SOLO #ifndef Z_SOLO
# define gz_error z_gz_error #define gz_error z_gz_error
# define gz_intmax z_gz_intmax #define gz_intmax z_gz_intmax
# define gz_strwinerror z_gz_strwinerror #define gz_strwinerror z_gz_strwinerror
# define gzbuffer z_gzbuffer #define gzbuffer z_gzbuffer
# define gzclearerr z_gzclearerr #define gzclearerr z_gzclearerr
# define gzclose z_gzclose #define gzclose z_gzclose
# define gzclose_r z_gzclose_r #define gzclose_r z_gzclose_r
# define gzclose_w z_gzclose_w #define gzclose_w z_gzclose_w
# define gzdirect z_gzdirect #define gzdirect z_gzdirect
# define gzdopen z_gzdopen #define gzdopen z_gzdopen
# define gzeof z_gzeof #define gzeof z_gzeof
# define gzerror z_gzerror #define gzerror z_gzerror
# define gzflush z_gzflush #define gzflush z_gzflush
# define gzfread z_gzfread #define gzfread z_gzfread
# define gzfwrite z_gzfwrite #define gzfwrite z_gzfwrite
# define gzgetc z_gzgetc #define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_ #define gzgetc_ z_gzgetc_
# define gzgets z_gzgets #define gzgets z_gzgets
# define gzoffset z_gzoffset #define gzoffset z_gzoffset
# define gzoffset64 z_gzoffset64 #define gzoffset64 z_gzoffset64
# define gzopen z_gzopen #define gzopen z_gzopen
# define gzopen64 z_gzopen64 #define gzopen64 z_gzopen64
# ifdef _WIN32 #ifdef _WIN32
# define gzopen_w z_gzopen_w #define gzopen_w z_gzopen_w
# endif #endif
# define gzprintf z_gzprintf #define gzprintf z_gzprintf
# define gzputc z_gzputc #define gzputc z_gzputc
# define gzputs z_gzputs #define gzputs z_gzputs
# define gzread z_gzread #define gzread z_gzread
# define gzrewind z_gzrewind #define gzrewind z_gzrewind
# define gzseek z_gzseek #define gzseek z_gzseek
# define gzseek64 z_gzseek64 #define gzseek64 z_gzseek64
# define gzsetparams z_gzsetparams #define gzsetparams z_gzsetparams
# define gztell z_gztell #define gztell z_gztell
# define gztell64 z_gztell64 #define gztell64 z_gztell64
# define gzungetc z_gzungetc #define gzungetc z_gzungetc
# define gzvprintf z_gzvprintf #define gzvprintf z_gzvprintf
# define gzwrite z_gzwrite #define gzwrite z_gzwrite
# endif #endif
# define inflate z_inflate #define inflate z_inflate
# define inflateBack z_inflateBack #define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd #define inflateBackEnd z_inflateBackEnd
# define inflateBackInit z_inflateBackInit #define inflateBackInit z_inflateBackInit
# define inflateBackInit_ z_inflateBackInit_ #define inflateBackInit_ z_inflateBackInit_
# define inflateCodesUsed z_inflateCodesUsed #define inflateCodesUsed z_inflateCodesUsed
# define inflateCopy z_inflateCopy #define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd #define inflateEnd z_inflateEnd
# define inflateGetDictionary z_inflateGetDictionary #define inflateGetDictionary z_inflateGetDictionary
# define inflateGetHeader z_inflateGetHeader #define inflateGetHeader z_inflateGetHeader
# define inflateInit z_inflateInit #define inflateInit z_inflateInit
# define inflateInit2 z_inflateInit2 #define inflateInit2 z_inflateInit2
# define inflateInit2_ z_inflateInit2_ #define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_ #define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark #define inflateMark z_inflateMark
# define inflatePrime z_inflatePrime #define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset #define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2 #define inflateReset2 z_inflateReset2
# define inflateResetKeep z_inflateResetKeep #define inflateResetKeep z_inflateResetKeep
# define inflateSetDictionary z_inflateSetDictionary #define inflateSetDictionary z_inflateSetDictionary
# define inflateSync z_inflateSync #define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint #define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine #define inflateUndermine z_inflateUndermine
# define inflateValidate z_inflateValidate #define inflateValidate z_inflateValidate
# define inflate_copyright z_inflate_copyright #define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast #define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table #define inflate_table z_inflate_table
# ifndef Z_SOLO #ifndef Z_SOLO
# define uncompress z_uncompress #define uncompress z_uncompress
# define uncompress2 z_uncompress2 #define uncompress2 z_uncompress2
# endif #endif
# define zError z_zError #define zError z_zError
# ifndef Z_SOLO #ifndef Z_SOLO
# define zcalloc z_zcalloc #define zcalloc z_zcalloc
# define zcfree z_zcfree #define zcfree z_zcfree
# endif #endif
# define zlibCompileFlags z_zlibCompileFlags #define zlibCompileFlags z_zlibCompileFlags
# define zlibVersion z_zlibVersion #define zlibVersion z_zlibVersion
/* all zlib typedefs in zlib.h and zconf.h */ /* all zlib typedefs in zlib.h and zconf.h */
# define Byte z_Byte #define Byte z_Byte
# define Bytef z_Bytef #define Bytef z_Bytef
# define alloc_func z_alloc_func #define alloc_func z_alloc_func
# define charf z_charf #define charf z_charf
# define free_func z_free_func #define free_func z_free_func
# ifndef Z_SOLO #ifndef Z_SOLO
# define gzFile z_gzFile #define gzFile z_gzFile
# endif #endif
# define gz_header z_gz_header #define gz_header z_gz_header
# define gz_headerp z_gz_headerp #define gz_headerp z_gz_headerp
# define in_func z_in_func #define in_func z_in_func
# define intf z_intf #define intf z_intf
# define out_func z_out_func #define out_func z_out_func
# define uInt z_uInt #define uInt z_uInt
# define uIntf z_uIntf #define uIntf z_uIntf
# define uLong z_uLong #define uLong z_uLong
# define uLongf z_uLongf #define uLongf z_uLongf
# define voidp z_voidp #define voidp z_voidp
# define voidpc z_voidpc #define voidpc z_voidpc
# define voidpf z_voidpf #define voidpf z_voidpf
/* all zlib structs in zlib.h and zconf.h */ /* all zlib structs in zlib.h and zconf.h */
# define gz_header_s z_gz_header_s #define gz_header_s z_gz_header_s
# define internal_state z_internal_state #define internal_state z_internal_state
#endif #endif
#if defined(__MSDOS__) && !defined(MSDOS) #if defined(__MSDOS__) && !defined(MSDOS)
# define MSDOS #define MSDOS
#endif #endif
#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
# define OS2 #define OS2
#endif #endif
#if defined(_WINDOWS) && !defined(WINDOWS) #if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS #define WINDOWS
#endif #endif
#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
# ifndef WIN32 #ifndef WIN32
# define WIN32 #define WIN32
# endif #endif
#endif #endif
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) #if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
# ifndef SYS16BIT #ifndef SYS16BIT
# define SYS16BIT #define SYS16BIT
# endif #endif
# endif #endif
#endif #endif
/* /*
...@@ -192,73 +192,73 @@ ...@@ -192,73 +192,73 @@
* than 64k bytes at a time (needed on systems with 16-bit int). * than 64k bytes at a time (needed on systems with 16-bit int).
*/ */
#ifdef SYS16BIT #ifdef SYS16BIT
# define MAXSEG_64K #define MAXSEG_64K
#endif #endif
#ifdef MSDOS #ifdef MSDOS
# define UNALIGNED_OK #define UNALIGNED_OK
#endif #endif
#ifdef __STDC_VERSION__ #ifdef __STDC_VERSION__
# ifndef STDC #ifndef STDC
# define STDC #define STDC
# endif #endif
# if __STDC_VERSION__ >= 199901L #if __STDC_VERSION__ >= 199901L
# ifndef STDC99 #ifndef STDC99
# define STDC99 #define STDC99
# endif #endif
# endif #endif
#endif #endif
#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
# define STDC #define STDC
#endif #endif
#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
# define STDC #define STDC
#endif #endif
#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
# define STDC #define STDC
#endif #endif
#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
# define STDC #define STDC
#endif #endif
#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ #if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
# define STDC #define STDC
#endif #endif
#ifndef STDC #ifndef STDC
# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ #ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
# define const /* note: need a more gentle solution here */ #define const /* note: need a more gentle solution here */
# endif #endif
#endif #endif
#if defined(ZLIB_CONST) && !defined(z_const) #if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const #define z_const const
#else #else
# define z_const #define z_const
#endif #endif
#ifdef Z_SOLO #ifdef Z_SOLO
typedef uint64_t z_size_t; typedef uint64_t z_size_t;
#else
#define z_longlong int64_t
#if defined(NO_SIZE_T)
typedef unsigned NO_SIZE_T z_size_t;
#elif defined(STDC)
#include <stddef.h>
typedef size_t z_size_t;
#else #else
# define z_longlong int64_t typedef uint64_t z_size_t;
# if defined(NO_SIZE_T) #endif
typedef unsigned NO_SIZE_T z_size_t; #undef z_longlong
# elif defined(STDC)
# include <stddef.h>
typedef size_t z_size_t;
# else
typedef uint64_t z_size_t;
# endif
# undef z_longlong
#endif #endif
/* Maximum value for memLevel in deflateInit2 */ /* Maximum value for memLevel in deflateInit2 */
#ifndef MAX_MEM_LEVEL #ifndef MAX_MEM_LEVEL
# ifdef MAXSEG_64K #ifdef MAXSEG_64K
# define MAX_MEM_LEVEL 8 #define MAX_MEM_LEVEL 8
# else #else
# define MAX_MEM_LEVEL 9 #define MAX_MEM_LEVEL 9
# endif #endif
#endif #endif
/* Maximum value for windowBits in deflateInit2 and inflateInit2. /* Maximum value for windowBits in deflateInit2 and inflateInit2.
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
* gzip.) * gzip.)
*/ */
#ifndef MAX_WBITS #ifndef MAX_WBITS
# define MAX_WBITS 15 /* 32K LZ77 window */ #define MAX_WBITS 15 /* 32K LZ77 window */
#endif #endif
/* The memory requirements for deflate are (in bytes): /* The memory requirements for deflate are (in bytes):
...@@ -283,22 +283,22 @@ ...@@ -283,22 +283,22 @@
for small objects. for small objects.
*/ */
/* Type declarations */ /* Type declarations */
#ifndef OF /* function prototypes */ #ifndef OF /* function prototypes */
# ifdef STDC #ifdef STDC
# define OF(args) args #define OF(args) args
# else #else
# define OF(args) () #define OF(args) ()
# endif #endif
#endif #endif
#ifndef Z_ARG /* function prototypes for stdarg */ #ifndef Z_ARG /* function prototypes for stdarg */
# if defined(STDC) || defined(Z_HAVE_STDARG_H) #if defined(STDC) || defined(Z_HAVE_STDARG_H)
# define Z_ARG(args) args #define Z_ARG(args) args
# else #else
# define Z_ARG(args) () #define Z_ARG(args) ()
# endif #endif
#endif #endif
/* The following definitions for FAR are needed only for MSDOS mixed /* The following definitions for FAR are needed only for MSDOS mixed
...@@ -308,83 +308,83 @@ ...@@ -308,83 +308,83 @@
* just define FAR to be empty. * just define FAR to be empty.
*/ */
#ifdef SYS16BIT #ifdef SYS16BIT
# if defined(M_I86SM) || defined(M_I86MM) #if defined(M_I86SM) || defined(M_I86MM)
/* MSC small or medium model */ /* MSC small or medium model */
# define SMALL_MEDIUM #define SMALL_MEDIUM
# ifdef _MSC_VER #ifdef _MSC_VER
# define FAR _far #define FAR _far
# else #else
# define FAR far #define FAR far
# endif #endif
# endif #endif
# if (defined(__SMALL__) || defined(__MEDIUM__)) #if (defined(__SMALL__) || defined(__MEDIUM__))
/* Turbo C small or medium model */ /* Turbo C small or medium model */
# define SMALL_MEDIUM #define SMALL_MEDIUM
# ifdef __BORLANDC__ #ifdef __BORLANDC__
# define FAR _far #define FAR _far
# else #else
# define FAR far #define FAR far
# endif #endif
# endif #endif
#endif #endif
#if defined(WINDOWS) || defined(WIN32) #if defined(WINDOWS) || defined(WIN32)
/* If building or using zlib as a DLL, define ZLIB_DLL. /* If building or using zlib as a DLL, define ZLIB_DLL.
* This is not mandatory, but it offers a little performance increase. * This is not mandatory, but it offers a little performance increase.
*/ */
# ifdef ZLIB_DLL #ifdef ZLIB_DLL
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) #if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
# ifdef ZLIB_INTERNAL #ifdef ZLIB_INTERNAL
# define ZEXTERN extern __declspec(dllexport) #define ZEXTERN extern __declspec(dllexport)
# else #else
# define ZEXTERN extern __declspec(dllimport) #define ZEXTERN extern __declspec(dllimport)
# endif #endif
# endif #endif
# endif /* ZLIB_DLL */ #endif /* ZLIB_DLL */
/* If building or using zlib with the WINAPI/WINAPIV calling convention, /* If building or using zlib with the WINAPI/WINAPIV calling convention,
* define ZLIB_WINAPI. * define ZLIB_WINAPI.
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
*/ */
# ifdef ZLIB_WINAPI #ifdef ZLIB_WINAPI
# ifdef FAR #ifdef FAR
# undef FAR #undef FAR
# endif #endif
# include <windows.h> #include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */ /* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
# define ZEXPORT WINAPI #define ZEXPORT WINAPI
# ifdef WIN32 #ifdef WIN32
# define ZEXPORTVA WINAPIV #define ZEXPORTVA WINAPIV
# else #else
# define ZEXPORTVA FAR CDECL #define ZEXPORTVA FAR CDECL
# endif #endif
# endif #endif
#endif #endif
#if defined (__BEOS__) #if defined(__BEOS__)
# ifdef ZLIB_DLL #ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL #ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport) #define ZEXPORT __declspec(dllexport)
# define ZEXPORTVA __declspec(dllexport) #define ZEXPORTVA __declspec(dllexport)
# else #else
# define ZEXPORT __declspec(dllimport) #define ZEXPORT __declspec(dllimport)
# define ZEXPORTVA __declspec(dllimport) #define ZEXPORTVA __declspec(dllimport)
# endif #endif
# endif #endif
#endif #endif
#ifndef ZEXTERN #ifndef ZEXTERN
# define ZEXTERN extern #define ZEXTERN extern
#endif #endif
#ifndef ZEXPORT #ifndef ZEXPORT
# define ZEXPORT #define ZEXPORT
#endif #endif
#ifndef ZEXPORTVA #ifndef ZEXPORTVA
# define ZEXPORTVA #define ZEXPORTVA
#endif #endif
#ifndef FAR #ifndef FAR
# define FAR #define FAR
#endif #endif
#if !defined(__MACTYPES__) #if !defined(__MACTYPES__)
...@@ -394,10 +394,10 @@ typedef unsigned int uInt; /* 16 bits or more */ ...@@ -394,10 +394,10 @@ typedef unsigned int uInt; /* 16 bits or more */
typedef uint64_t uLong; /* 32 bits or more */ typedef uint64_t uLong; /* 32 bits or more */
#ifdef SMALL_MEDIUM #ifdef SMALL_MEDIUM
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
# define Bytef Byte FAR #define Bytef Byte FAR
#else #else
typedef Byte FAR Bytef; typedef Byte FAR Bytef;
#endif #endif
typedef char FAR charf; typedef char FAR charf;
typedef int FAR intf; typedef int FAR intf;
...@@ -405,56 +405,56 @@ typedef uInt FAR uIntf; ...@@ -405,56 +405,56 @@ typedef uInt FAR uIntf;
typedef uLong FAR uLongf; typedef uLong FAR uLongf;
#ifdef STDC #ifdef STDC
typedef void const *voidpc; typedef void const *voidpc;
typedef void FAR *voidpf; typedef void FAR *voidpf;
typedef void *voidp; typedef void * voidp;
#else #else
typedef Byte const *voidpc; typedef Byte const *voidpc;
typedef Byte FAR *voidpf; typedef Byte FAR *voidpf;
typedef Byte *voidp; typedef Byte * voidp;
#endif #endif
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
# include <limits.h> #include <limits.h>
# if (UINT_MAX == 0xffffffffUL) #if (UINT_MAX == 0xffffffffUL)
# define Z_U4 unsigned #define Z_U4 unsigned
# elif (ULONG_MAX == 0xffffffffUL) #elif (ULONG_MAX == 0xffffffffUL)
# define Z_U4 uint64_t #define Z_U4 uint64_t
# elif (USHRT_MAX == 0xffffffffUL) #elif (USHRT_MAX == 0xffffffffUL)
# define Z_U4 unsigned short #define Z_U4 unsigned short
# endif #endif
#endif #endif
#ifdef Z_U4 #ifdef Z_U4
typedef Z_U4 z_crc_t; typedef Z_U4 z_crc_t;
#else #else
typedef uint64_t z_crc_t; typedef uint64_t z_crc_t;
#endif #endif
#if 1 /* was set to #if 1 by ./configure */ #if 1 /* was set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H #define Z_HAVE_UNISTD_H
#endif #endif
#if 1 /* was set to #if 1 by ./configure */ #if 1 /* was set to #if 1 by ./configure */
# define Z_HAVE_STDARG_H #define Z_HAVE_STDARG_H
#endif #endif
#ifdef STDC #ifdef STDC
# ifndef Z_SOLO #ifndef Z_SOLO
# include <sys/types.h> /* for off_t */ #include <sys/types.h> /* for off_t */
# endif #endif
#endif #endif
#if defined(STDC) || defined(Z_HAVE_STDARG_H) #if defined(STDC) || defined(Z_HAVE_STDARG_H)
# ifndef Z_SOLO #ifndef Z_SOLO
# include <stdarg.h> /* for va_list */ #include <stdarg.h> /* for va_list */
# endif #endif
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# ifndef Z_SOLO #ifndef Z_SOLO
# include <stddef.h> /* for wchar_t */ #include <stddef.h> /* for wchar_t */
# endif #endif
#endif #endif
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
...@@ -464,71 +464,76 @@ typedef uLong FAR uLongf; ...@@ -464,71 +464,76 @@ typedef uLong FAR uLongf;
* equivalently requesting no 64-bit operations * equivalently requesting no 64-bit operations
*/ */
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 #if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
# undef _LARGEFILE64_SOURCE #undef _LARGEFILE64_SOURCE
#endif #endif
#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) #if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
# define Z_HAVE_UNISTD_H #define Z_HAVE_UNISTD_H
#endif #endif
#ifndef Z_SOLO #ifndef Z_SOLO
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) #if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ #if (_WIN64)
# ifdef VMS #include <io.h>
# include <unixio.h> /* for off_t */ #include <process.h>
# endif #else
# ifndef z_off_t #include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
# define z_off_t off_t #endif
# endif #ifdef VMS
# endif #include <unixio.h> /* for off_t */
#endif
#ifndef z_off_t
#define z_off_t off_t
#endif
#endif
#endif #endif
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 #if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE - 0
# define Z_LFS64 #define Z_LFS64
#endif #endif
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) #if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
# define Z_LARGE64 #define Z_LARGE64
#endif #endif
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) #if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS - 0 == 64 && defined(Z_LFS64)
# define Z_WANT64 #define Z_WANT64
#endif #endif
#if !defined(SEEK_SET) && !defined(Z_SOLO) #if !defined(SEEK_SET) && !defined(Z_SOLO)
# define SEEK_SET 0 /* Seek from beginning of file. */ #define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */ #define SEEK_CUR 1 /* Seek from current position. */
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ #define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
#endif #endif
#ifndef z_off_t #ifndef z_off_t
# define z_off_t int64_t #define z_off_t int64_t
#endif #endif
#if !defined(_WIN32) && defined(Z_LARGE64) #if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t #define z_off64_t off64_t
#else
#if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
#define z_off64_t __int64
#else #else
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) #define z_off64_t z_off_t
# define z_off64_t __int64 #endif
# else
# define z_off64_t z_off_t
# endif
#endif #endif
/* MVS linker does not support external names larger than 8 bytes */ /* MVS linker does not support external names larger than 8 bytes */
#if defined(__MVS__) #if defined(__MVS__)
#pragma map(deflateInit_,"DEIN") #pragma map(deflateInit_, "DEIN")
#pragma map(deflateInit2_,"DEIN2") #pragma map(deflateInit2_, "DEIN2")
#pragma map(deflateEnd,"DEEND") #pragma map(deflateEnd, "DEEND")
#pragma map(deflateBound,"DEBND") #pragma map(deflateBound, "DEBND")
#pragma map(inflateInit_,"ININ") #pragma map(inflateInit_, "ININ")
#pragma map(inflateInit2_,"ININ2") #pragma map(inflateInit2_, "ININ2")
#pragma map(inflateEnd,"INEND") #pragma map(inflateEnd, "INEND")
#pragma map(inflateSync,"INSY") #pragma map(inflateSync, "INSY")
#pragma map(inflateSetDictionary,"INSEDI") #pragma map(inflateSetDictionary, "INSEDI")
#pragma map(compressBound,"CMBND") #pragma map(compressBound, "CMBND")
#pragma map(inflate_table,"INTABL") #pragma map(inflate_table, "INTABL")
#pragma map(inflate_fast,"INFA") #pragma map(inflate_fast, "INFA")
#pragma map(inflate_copyright,"INCOPY") #pragma map(inflate_copyright, "INCOPY")
#endif #endif
#endif /* ZCONF_H */ #endif /* ZCONF_H */
deps/zlib-1.2.11/src/zconf.h
浏览文件 @ 8c466920
...@@ -472,7 +472,12 @@ typedef uLong FAR uLongf; ...@@ -472,7 +472,12 @@ typedef uLong FAR uLongf;
#endif #endif
#ifndef Z_SOLO #ifndef Z_SOLO
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) # if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ #if (_WIN64)
#include <io.h>
#include <process.h>
#else
#include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
#endif
# ifdef VMS # ifdef VMS
# include <unixio.h> /* for off_t */ # include <unixio.h> /* for off_t */
# endif # endif
......
src/client/CMakeLists.txt
浏览文件 @ 8c466920
...@@ -37,7 +37,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -37,7 +37,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(tests)
ELSEIF (TD_WINDOWS_64) ELSEIF (TD_WINDOWS)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
......
src/kit/shell/CMakeLists.txt
浏览文件 @ 8c466920
...@@ -22,7 +22,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -22,7 +22,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
# ENDIF () # ENDIF ()
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos) SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
ELSEIF (TD_WINDOWS_64) ELSEIF (TD_WINDOWS)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
LIST(APPEND SRC ./src/shellEngine.c) LIST(APPEND SRC ./src/shellEngine.c)
......
src/util/inc/tchecksum.h
浏览文件 @ 8c466920
...@@ -53,7 +53,12 @@ static FORCE_INLINE int taosCheckChecksum(const uint8_t *stream, uint32_t ssize, ...@@ -53,7 +53,12 @@ static FORCE_INLINE int taosCheckChecksum(const uint8_t *stream, uint32_t ssize,
static FORCE_INLINE int taosCheckChecksumWhole(const uint8_t *stream, uint32_t ssize) { static FORCE_INLINE int taosCheckChecksumWhole(const uint8_t *stream, uint32_t ssize) {
if (ssize < sizeof(TSCKSUM)) return 0; if (ssize < sizeof(TSCKSUM)) return 0;
#if (_WIN64)
return 1;
#else
return *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) == (*crc32c)(0, stream, (size_t)(ssize - sizeof(TSCKSUM))); return *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) == (*crc32c)(0, stream, (size_t)(ssize - sizeof(TSCKSUM)));
#endif
} }
#ifdef __cplusplus #ifdef __cplusplus
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或