diff --git a/programs/bench.c b/programs/bench.c index a4b57efcb..2b7436a4f 100644 --- a/programs/bench.c +++ b/programs/bench.c @@ -18,7 +18,6 @@ #include /* fprintf, fopen, ftello64 */ #include /* clock_t, clock, CLOCKS_PER_SEC */ -#include "mem.h" #define ZSTD_STATIC_LINKING_ONLY #include "zstd.h" #include "datagen.h" /* RDG_genBuffer */ diff --git a/programs/datagen.c b/programs/datagen.c index 1af5a38a5..da5124cfc 100644 --- a/programs/datagen.c +++ b/programs/datagen.c @@ -20,22 +20,10 @@ /*-************************************ * Dependencies **************************************/ +#include "util.h" /* U32 */ #include /* malloc, free */ #include /* FILE, fwrite, fprintf */ #include /* memcpy */ -#include "mem.h" /* U32 */ - - -/*-************************************ -* OS-specific Includes -**************************************/ -#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -# include /* _O_BINARY */ -# include /* _setmode, _isatty */ -# define SET_BINARY_MODE(file) {int unused = _setmode(_fileno(file), _O_BINARY); (void)unused; } -#else -# define SET_BINARY_MODE(file) -#endif /*-************************************ diff --git a/programs/dibio.c b/programs/dibio.c index 152ea4d09..1c22949f1 100644 --- a/programs/dibio.c +++ b/programs/dibio.c @@ -20,7 +20,6 @@ #include /* clock_t, clock, CLOCKS_PER_SEC */ #include /* errno */ -#include "mem.h" /* read */ #include "error_private.h" #include "dibio.h" diff --git a/programs/fileio.c b/programs/fileio.c index 325a17a59..58fe7e355 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -30,7 +30,6 @@ #include /* clock */ #include /* errno */ -#include "mem.h" #include "fileio.h" #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_magicNumber, ZSTD_frameHeaderSize_max */ #include "zstd.h" @@ -42,19 +41,6 @@ #endif -/*-************************************* -* OS-specific Includes -***************************************/ -#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -# include /* _O_BINARY */ -# include /* _setmode, _isatty */ -# define SET_BINARY_MODE(file) { if (_setmode(_fileno(file), _O_BINARY) == -1) perror("Cannot set _O_BINARY"); } -#else -# include /* isatty */ -# define SET_BINARY_MODE(file) -#endif - - /*-************************************* * Constants ***************************************/ diff --git a/tests/datagencli.c b/tests/datagencli.c index 2b3d3b511..c4bf48934 100644 --- a/tests/datagencli.c +++ b/tests/datagencli.c @@ -12,9 +12,9 @@ * Dependencies **************************************/ #include "platform.h" /* Compiler options */ +#include "util.h" /* U32 */ #include /* fprintf, stderr */ #include "datagen.h" /* RDG_generate */ -#include "mem.h" /* U32, U64 */ /*-************************************ diff --git a/tests/fullbench.c b/tests/fullbench.c index e5547d089..439de5c76 100644 --- a/tests/fullbench.c +++ b/tests/fullbench.c @@ -12,12 +12,11 @@ * Includes **************************************/ #include "platform.h" /* Compiler options */ -#include "util.h" /* UTIL_GetFileSize */ +#include "util.h" /* U32 */ #include /* malloc */ #include /* fprintf, fopen, ftello64 */ #include /* clock_t, clock, CLOCKS_PER_SEC */ -#include "mem.h" #ifndef ZSTD_DLL_IMPORT #include "zstd_internal.h" /* ZSTD_blockHeaderSize, blockType_e, KB, MB */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_compressBegin, ZSTD_compressContinue, etc. */ diff --git a/tests/fuzzer.c b/tests/fuzzer.c index 86d4c6beb..9088e2483 100644 --- a/tests/fuzzer.c +++ b/tests/fuzzer.c @@ -12,8 +12,6 @@ * Compiler specific **************************************/ #ifdef _MSC_VER /* Visual Studio */ -# define _CRT_SECURE_NO_WARNINGS /* fgets */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ # pragma warning(disable : 4204) /* disable: C4204: non-constant aggregate initializer */ #endif @@ -21,6 +19,8 @@ /*-************************************ * Includes **************************************/ +#include "platform.h" /* Compiler options */ +#include "util.h" /* U32 */ #include /* free */ #include /* fgets, sscanf */ #include /* strcmp */ @@ -30,7 +30,6 @@ #include "zstd_errors.h" /* ZSTD_getErrorCode */ #include "zdict.h" /* ZDICT_trainFromBuffer */ #include "datagen.h" /* RDG_genBuffer */ -#include "mem.h" #define XXH_STATIC_LINKING_ONLY #include "xxhash.h" /* XXH64 */ diff --git a/tests/paramgrill.c b/tests/paramgrill.c index 19658fddb..0825b37a6 100644 --- a/tests/paramgrill.c +++ b/tests/paramgrill.c @@ -12,14 +12,14 @@ * Dependencies **************************************/ #include "platform.h" /* Compiler options */ -#include "util.h" /* UTIL_GetFileSize */ +#include "util.h" /* UTIL_getFileSize */ #include /* malloc */ #include /* fprintf, fopen, ftello64 */ #include /* strcmp */ #include /* log */ #include /* clock_t */ -#include "mem.h" +#include "mem.h" /* MEM_32bits() */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_parameters, ZSTD_estimateCCtxSize */ #include "zstd.h" #include "datagen.h" diff --git a/tests/zbufftest.c b/tests/zbufftest.c index 14b739233..87cf80b5e 100644 --- a/tests/zbufftest.c +++ b/tests/zbufftest.c @@ -12,8 +12,6 @@ * Compiler specific **************************************/ #ifdef _MSC_VER /* Visual Studio */ -# define _CRT_SECURE_NO_WARNINGS /* fgets */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ # pragma warning(disable : 4146) /* disable: C4146: minus unsigned expression */ #endif @@ -21,11 +19,12 @@ /*-************************************ * Includes **************************************/ +#include "platform.h" /* Compiler options */ #include /* free */ #include /* fgets, sscanf */ #include /* clock_t, clock() */ #include /* strcmp */ -#include "mem.h" +#include "mem.h" /* MEM_writeLE32 */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel */ #include "zstd.h" /* ZSTD_compressBound */ #define ZBUFF_STATIC_LINKING_ONLY /* ZBUFF_createCCtx_advanced */ diff --git a/tests/zstreamtest.c b/tests/zstreamtest.c index ce6193085..9da0010be 100644 --- a/tests/zstreamtest.c +++ b/tests/zstreamtest.c @@ -12,8 +12,6 @@ * Compiler specific **************************************/ #ifdef _MSC_VER /* Visual Studio */ -# define _CRT_SECURE_NO_WARNINGS /* fgets */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ # pragma warning(disable : 4146) /* disable: C4146: minus unsigned expression */ #endif @@ -21,11 +19,12 @@ /*-************************************ * Includes **************************************/ +#include "platform.h" /* Compiler options */ #include /* free */ #include /* fgets, sscanf */ #include /* clock_t, clock() */ #include /* strcmp */ -#include "mem.h" +#include "mem.h" /* MEM_writeLE32 */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel, ZSTD_customMem */ #include "zstd.h" /* ZSTD_compressBound */ #include "zstd_errors.h" /* ZSTD_error_srcSize_wrong */ diff --git a/zlibWrapper/examples/zwrapbench.c b/zlibWrapper/examples/zwrapbench.c index c3968dba3..8999657fa 100644 --- a/zlibWrapper/examples/zwrapbench.c +++ b/zlibWrapper/examples/zwrapbench.c @@ -12,14 +12,13 @@ * Includes ***************************************/ #include "platform.h" /* Compiler options */ -#include "util.h" /* UTIL_GetFileSize, UTIL_sleep */ +#include "util.h" /* U32, UTIL_GetFileSize, UTIL_sleep */ #include /* malloc, free */ #include /* memset */ #include /* fprintf, fopen, ftello64 */ #include /* clock_t, clock, CLOCKS_PER_SEC */ #include /* toupper */ -#include "mem.h" #define ZSTD_STATIC_LINKING_ONLY #include "zstd.h" #include "datagen.h" /* RDG_genBuffer */