From e75909ef93c87c3b716f3fb85aaf81f5ef0e6310 Mon Sep 17 00:00:00 2001
From: inikep <inikep@gmail.com>
Date: Wed, 25 May 2016 11:31:16 +0200
Subject: [PATCH] ZBUFF_createCCtx_advanced moved to zbuff_static.h

---
 lib/common/zbuff.h        |  3 ---
 lib/common/zbuff_static.h | 17 ++++++++++++++++-
 programs/fileio.c         |  1 +
 programs/zbufftest.c      | 15 ++++++++-------
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/common/zbuff.h b/lib/common/zbuff.h
index 4d7f12a1..89207bd2 100644
--- a/lib/common/zbuff.h
+++ b/lib/common/zbuff.h
@@ -39,7 +39,6 @@ extern "C" {
 *  Dependencies
 ***************************************/
 #include <stddef.h>      /* size_t */
-#include "zstd_static.h" /* ZSTD_customMem */
 
 
 /* ***************************************************************
@@ -61,7 +60,6 @@ extern "C" {
 ***************************************/
 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 @@ ZSTDLIB_API size_t ZBUFF_compressEnd(ZBUFF_CCtx* cctx, void* dst, size_t* dstCap
 
 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 4c52eef2..6a4287e4 100644
--- a/lib/common/zbuff_static.h
+++ b/lib/common/zbuff_static.h
@@ -46,7 +46,22 @@ extern "C" {
 ***************************************/
 #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 51707e8b..eba90d01 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 e9e54586..fce0ab27 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 */
 
 
 /*-************************************