platform.h: removed Compiler Options
diff --git a/tests/datagencli.c b/tests/datagencli.c
index c4bf489..2f3ebc4 100644
--- a/tests/datagencli.c
+++ b/tests/datagencli.c
@@ -11,8 +11,7 @@
/*-************************************
* Dependencies
**************************************/
-#include "platform.h" /* Compiler options */
-#include "util.h" /* U32 */
+#include "util.h" /* Compiler options */
#include <stdio.h> /* fprintf, stderr */
#include "datagen.h" /* RDG_generate */
diff --git a/tests/fullbench.c b/tests/fullbench.c
index 439de5c..233b4e9 100644
--- a/tests/fullbench.c
+++ b/tests/fullbench.c
@@ -11,12 +11,12 @@
/*_************************************
* Includes
**************************************/
-#include "platform.h" /* Compiler options */
-#include "util.h" /* U32 */
+#include "util.h" /* Compiler options, UTIL_GetFileSize */
#include <stdlib.h> /* malloc */
#include <stdio.h> /* fprintf, fopen, ftello64 */
#include <time.h> /* 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 9088e24..86d4c6b 100644
--- a/tests/fuzzer.c
+++ b/tests/fuzzer.c
@@ -12,6 +12,8 @@
* 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
@@ -19,8 +21,6 @@
/*-************************************
* Includes
**************************************/
-#include "platform.h" /* Compiler options */
-#include "util.h" /* U32 */
#include <stdlib.h> /* free */
#include <stdio.h> /* fgets, sscanf */
#include <string.h> /* strcmp */
@@ -30,6 +30,7 @@
#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 0825b37..5eabcba 100644
--- a/tests/paramgrill.c
+++ b/tests/paramgrill.c
@@ -11,15 +11,14 @@
/*-************************************
* Dependencies
**************************************/
-#include "platform.h" /* Compiler options */
-#include "util.h" /* UTIL_getFileSize */
+#include "util.h" /* Compiler options, UTIL_GetFileSize */
#include <stdlib.h> /* malloc */
#include <stdio.h> /* fprintf, fopen, ftello64 */
#include <string.h> /* strcmp */
#include <math.h> /* log */
#include <time.h> /* clock_t */
-#include "mem.h" /* MEM_32bits() */
+#include "mem.h"
#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 87cf80b..14b7392 100644
--- a/tests/zbufftest.c
+++ b/tests/zbufftest.c
@@ -12,6 +12,8 @@
* 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
@@ -19,12 +21,11 @@
/*-************************************
* Includes
**************************************/
-#include "platform.h" /* Compiler options */
#include <stdlib.h> /* free */
#include <stdio.h> /* fgets, sscanf */
#include <time.h> /* clock_t, clock() */
#include <string.h> /* strcmp */
-#include "mem.h" /* MEM_writeLE32 */
+#include "mem.h"
#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 9da0010..ce61930 100644
--- a/tests/zstreamtest.c
+++ b/tests/zstreamtest.c
@@ -12,6 +12,8 @@
* 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
@@ -19,12 +21,11 @@
/*-************************************
* Includes
**************************************/
-#include "platform.h" /* Compiler options */
#include <stdlib.h> /* free */
#include <stdio.h> /* fgets, sscanf */
#include <time.h> /* clock_t, clock() */
#include <string.h> /* strcmp */
-#include "mem.h" /* MEM_writeLE32 */
+#include "mem.h"
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel, ZSTD_customMem */
#include "zstd.h" /* ZSTD_compressBound */
#include "zstd_errors.h" /* ZSTD_error_srcSize_wrong */