ZBUFF_createCCtx_advanced moved to zbuff_static.h
diff --git a/lib/common/zbuff.h b/lib/common/zbuff.h
index 4d7f12a..89207bd 100644
--- a/lib/common/zbuff.h
+++ b/lib/common/zbuff.h
@@ -39,7 +39,6 @@
* Dependencies
***************************************/
#include <stddef.h> /* size_t */
-#include "zstd_static.h" /* ZSTD_customMem */
/* ***************************************************************
@@ -61,7 +60,6 @@
***************************************/
typedef struct ZBUFF_CCtx_s ZBUFF_CCtx;
ZSTDLIB_API ZBUFF_CCtx* ZBUFF_createCCtx(void);
-ZSTDLIB_API ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem);
ZSTDLIB_API size_t ZBUFF_freeCCtx(ZBUFF_CCtx* cctx);
ZSTDLIB_API size_t ZBUFF_compressInit(ZBUFF_CCtx* cctx, int compressionLevel);
@@ -114,7 +112,6 @@
typedef struct ZBUFF_DCtx_s ZBUFF_DCtx;
ZSTDLIB_API ZBUFF_DCtx* ZBUFF_createDCtx(void);
-ZSTDLIB_API ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem);
ZSTDLIB_API size_t ZBUFF_freeDCtx(ZBUFF_DCtx* dctx);
ZSTDLIB_API size_t ZBUFF_decompressInit(ZBUFF_DCtx* dctx);
diff --git a/lib/common/zbuff_static.h b/lib/common/zbuff_static.h
index 4c52eef..6a4287e 100644
--- a/lib/common/zbuff_static.h
+++ b/lib/common/zbuff_static.h
@@ -46,7 +46,22 @@
***************************************/
#include "zstd_static.h" /* ZSTD_parameters */
#include "zbuff.h"
-#include "zstd_internal.h" /* MIN */
+
+#ifndef MIN
+ #define MIN(a,b) ((a)<(b) ? (a) : (b))
+#endif
+
+
+/*-*************************************
+* Advanced functions
+***************************************/
+/*! ZBUFF_createCCtx_advanced() :
+ * Create a ZBUFF compression context using external alloc and free functions */
+ZSTDLIB_API ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem);
+
+/*! ZBUFF_createDCtx_advanced() :
+ * Create a ZBUFF decompression context using external alloc and free functions */
+ZSTDLIB_API ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem);
/* *************************************
diff --git a/programs/fileio.c b/programs/fileio.c
index 51707e8..eba90d0 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -57,6 +57,7 @@
#include "mem.h"
#include "fileio.h"
#include "zstd_static.h" /* ZSTD_magicNumber, ZSTD_frameHeaderSize_max */
+#include "zstd_internal.h" /* MIN, KB, MB */
#include "zbuff_static.h"
#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT==1)
diff --git a/programs/zbufftest.c b/programs/zbufftest.c
index e9e5458..fce0ab2 100644
--- a/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@ -35,15 +35,16 @@
/*-************************************
* Includes
**************************************/
-#include <stdlib.h> /* free */
-#include <stdio.h> /* fgets, sscanf */
-#include <sys/timeb.h> /* timeb */
-#include <string.h> /* strcmp */
+#include <stdlib.h> /* free */
+#include <stdio.h> /* fgets, sscanf */
+#include <sys/timeb.h> /* timeb */
+#include <string.h> /* strcmp */
#include "mem.h"
#include "zbuff.h"
-#include "zstd_static.h" /* ZSTD_compressBound(), ZSTD_maxCLevel() */
-#include "datagen.h" /* RDG_genBuffer */
-#include "xxhash.h" /* XXH64 */
+#include "zstd_static.h" /* ZSTD_compressBound(), ZSTD_maxCLevel() */
+#include "zbuff_static.h" /* ZBUFF_createCCtx_advanced */
+#include "datagen.h" /* RDG_genBuffer */
+#include "xxhash.h" /* XXH64 */
/*-************************************
