From 876075a808fcc61e2d859e217937fe64ff09aa0e Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 7 Nov 2018 14:54:36 +0300 Subject: some files contains LF and CRLF simultaneously --- include/delphi/m_zlib.inc | 148 +++++++++++++++++++++++----------------------- include/m_json.h | 4 +- 2 files changed, 76 insertions(+), 76 deletions(-) (limited to 'include') diff --git a/include/delphi/m_zlib.inc b/include/delphi/m_zlib.inc index 60a3a8b823..44cd9b6ac6 100644 --- a/include/delphi/m_zlib.inc +++ b/include/delphi/m_zlib.inc @@ -26,87 +26,87 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const ZlibDLL = 'zlib.mir'; - Z_NO_FLUSH = 0; - Z_PARTIAL_FLUSH = 1; - Z_SYNC_FLUSH = 2; - Z_FULL_FLUSH = 3; - Z_FINISH = 4; - Z_BLOCK = 5; - Z_TREES = 6; - - Z_OK = 0; - Z_STREAM_END = 1; - Z_NEED_DICT = 2; - Z_ERRNO = -1; - Z_STREAM_ERROR = -2; - Z_DATA_ERROR = -3; - Z_MEM_ERROR = -4; - Z_BUF_ERROR = -5; - Z_VERSION_ERROR = -6; - - Z_NO_COMPRESSION = 0; - Z_BEST_SPEED = 1; - Z_BEST_COMPRESSION = 9; - Z_DEFAULT_COMPRESSION = -1; - - Z_FILTERED = 1; - Z_HUFFMAN_ONLY = 2; - Z_RLE = 3; - Z_FIXED = 4; - Z_DEFAULT_STRATEGY = 0; - - Z_BINARY = 0; - Z_TEXT = 1; - Z_ASCII = 1; - Z_UNKNOWN = 2; - - Z_DEFLATED = 8; + Z_NO_FLUSH = 0; + Z_PARTIAL_FLUSH = 1; + Z_SYNC_FLUSH = 2; + Z_FULL_FLUSH = 3; + Z_FINISH = 4; + Z_BLOCK = 5; + Z_TREES = 6; + + Z_OK = 0; + Z_STREAM_END = 1; + Z_NEED_DICT = 2; + Z_ERRNO = -1; + Z_STREAM_ERROR = -2; + Z_DATA_ERROR = -3; + Z_MEM_ERROR = -4; + Z_BUF_ERROR = -5; + Z_VERSION_ERROR = -6; + + Z_NO_COMPRESSION = 0; + Z_BEST_SPEED = 1; + Z_BEST_COMPRESSION = 9; + Z_DEFAULT_COMPRESSION = -1; + + Z_FILTERED = 1; + Z_HUFFMAN_ONLY = 2; + Z_RLE = 3; + Z_FIXED = 4; + Z_DEFAULT_STRATEGY = 0; + + Z_BINARY = 0; + Z_TEXT = 1; + Z_ASCII = 1; + Z_UNKNOWN = 2; + + Z_DEFLATED = 8; type - alloc_func = function(opaque: pointer; items, size: integer): pointer; cdecl; - free_func = procedure(opaque, address: pointer); cdecl; - - in_func = function(opaque: pointer; var buf: PByte): integer; cdecl; - out_func = function(opaque: pointer; buf: PByte; size: integer): integer; cdecl; - - z_streamp = ^z_stream; - z_stream = packed record - next_in: PChar; (* next input byte *) - avail_in: integer; (* number of bytes available at next_in *) - total_in: LongInt; (* total nb of input bytes read so far *) - - next_out: PChar; (* next output byte should be put there *) - avail_out: integer; (* remaining free space at next_out *) - total_out: LongInt; (* total nb of bytes output so far *) - - msg: PChar; (* last error message, NULL if no error *) - state: pointer; (* not visible by applications *) - - zalloc: alloc_func; (* used to allocate the internal state *) - zfree: free_func; (* used to free the internal state *) - opaque: pointer; (* private data object passed to zalloc and zfree *) - - data_type: integer; (* best guess about the data type: ascii or binary *) - adler: LongInt; (* adler32 value of the uncompressed data *) - reserved: LongInt; (* reserved for future use *) - end; - -function deflateInit(var strm: z_stream; level: integer): integer; cdecl; + alloc_func = function(opaque: pointer; items, size: integer): pointer; cdecl; + free_func = procedure(opaque, address: pointer); cdecl; + + in_func = function(opaque: pointer; var buf: PByte): integer; cdecl; + out_func = function(opaque: pointer; buf: PByte; size: integer): integer; cdecl; + + z_streamp = ^z_stream; + z_stream = packed record + next_in: PChar; (* next input byte *) + avail_in: integer; (* number of bytes available at next_in *) + total_in: LongInt; (* total nb of input bytes read so far *) + + next_out: PChar; (* next output byte should be put there *) + avail_out: integer; (* remaining free space at next_out *) + total_out: LongInt; (* total nb of bytes output so far *) + + msg: PChar; (* last error message, NULL if no error *) + state: pointer; (* not visible by applications *) + + zalloc: alloc_func; (* used to allocate the internal state *) + zfree: free_func; (* used to free the internal state *) + opaque: pointer; (* private data object passed to zalloc and zfree *) + + data_type: integer; (* best guess about the data type: ascii or binary *) + adler: LongInt; (* adler32 value of the uncompressed data *) + reserved: LongInt; (* reserved for future use *) + end; + +function deflateInit(var strm: z_stream; level: integer): integer; cdecl; external ZlibDLL name 'deflateInit_'; - -function deflate(var strm: z_stream; flush: integer): integer; cdecl; + +function deflate(var strm: z_stream; flush: integer): integer; cdecl; external ZlibDLL name 'deflate'; - -function deflateEnd(var strm: z_stream): integer; cdecl; + +function deflateEnd(var strm: z_stream): integer; cdecl; external ZlibDLL name 'deflateEnd'; - -function inflateInit(var strm: z_stream): integer; cdecl; + +function inflateInit(var strm: z_stream): integer; cdecl; external ZlibDLL name 'inflateInit_'; - -function inflate(var strm: z_stream; flush: integer): integer; cdecl; + +function inflate(var strm: z_stream; flush: integer): integer; cdecl; external ZlibDLL name 'inflate'; - -function inflateEnd(var strm: z_stream): integer; cdecl; + +function inflateEnd(var strm: z_stream): integer; cdecl; external ZlibDLL name 'inflateEnd'; {$ENDIF} diff --git a/include/m_json.h b/include/m_json.h index 9df72cd305..10ce6779c6 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -164,8 +164,8 @@ LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const INT64_PARAM ¶m); LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const BOOL_PARAM ¶m); LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const CHAR_PARAM ¶m); LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const WCHAR_PARAM ¶m); -LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const NULL_PARAM ¶m); -LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const JSON_PARAM ¶m); +LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const NULL_PARAM ¶m); +LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const JSON_PARAM ¶m); #endif // __cplusplus -- cgit v1.2.3