renamed zstd_compress.h into zstd_compress_internal.h

to emphasize the fact that all definitions it contains
must remain private, accross lib/compress modules.

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 808418a60823225ef30ea6dc6a04178558b06a38..a1162e3a42552cc335a6b782bdc51dd5cc0fba7f 100644 (file)
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -26,7 +26,7 @@
 #include "fse.h"
 #define HUF_STATIC_LINKING_ONLY
 #include "huf.h"
-#include "zstd_compress.h"
+#include "zstd_compress_internal.h"
 #include "zstd_fast.h"
 #include "zstd_double_fast.h"
 #include "zstd_lazy.h"

diff --git a/lib/compress/zstd_compress.h b/lib/compress/zstd_compress_internal.h
similarity index 99%
rename from lib/compress/zstd_compress.h
rename to lib/compress/zstd_compress_internal.h
index bb508795d2d9115713e5eaa94fa8d888fb914867..e01d532ccfd7358ba987c8e02f32f8d8d275ed24 100644 (file)
--- a/lib/compress/zstd_compress.h
+++ b/lib/compress/zstd_compress_internal.h
@@ -9,7 +9,7 @@
  */
 
 /* This header contains definitions
- * that shall only be used by modules from within lib/compress.
+ * that shall **only** be used by modules within lib/compress.
  */
 
 #ifndef ZSTD_COMPRESS_H

diff --git a/lib/compress/zstd_double_fast.c b/lib/compress/zstd_double_fast.c
index 876a36042ce8e143c298c8bd9cebd7f44fcf65dc..fee5127c352bfde78f726e60e7a631dbb3f2b2e4 100644 (file)
--- a/lib/compress/zstd_double_fast.c
+++ b/lib/compress/zstd_double_fast.c
@@ -8,6 +8,7 @@
  * You may select, at your option, one of the above-listed licenses.
  */
 
+#include "zstd_compress_internal.h"
 #include "zstd_double_fast.h"
 
 

diff --git a/lib/compress/zstd_double_fast.h b/lib/compress/zstd_double_fast.h
index 3dba6c7108e5aa49e1b23cb43e579101cebd6f9c..75e0415809d6acd098abcb931d5dd0db689bca5e 100644 (file)
--- a/lib/compress/zstd_double_fast.h
+++ b/lib/compress/zstd_double_fast.h
@@ -11,12 +11,13 @@
 #ifndef ZSTD_DOUBLE_FAST_H
 #define ZSTD_DOUBLE_FAST_H
 
-#include "zstd_compress.h"
-
 #if defined (__cplusplus)
 extern "C" {
 #endif
 
+#include "mem.h"      /* U32 */
+#include "zstd.h"     /* ZSTD_CCtx, size_t */
+
 void ZSTD_fillDoubleHashTable(ZSTD_CCtx* cctx, const void* end, const U32 mls);
 size_t ZSTD_compressBlock_doubleFast(ZSTD_CCtx* ctx, const void* src, size_t srcSize);
 size_t ZSTD_compressBlock_doubleFast_extDict(ZSTD_CCtx* ctx, const void* src, size_t srcSize);

diff --git a/lib/compress/zstd_fast.c b/lib/compress/zstd_fast.c
index 2e057017b92e4867d17e3f3d870cd4850f196431..7b56c3d6adb69971b47f28b39b6eab6c21e39654 100644 (file)
--- a/lib/compress/zstd_fast.c
+++ b/lib/compress/zstd_fast.c
@@ -8,6 +8,7 @@
  * You may select, at your option, one of the above-listed licenses.
  */
 
+#include "zstd_compress_internal.h"
 #include "zstd_fast.h"
 
 

diff --git a/lib/compress/zstd_fast.h b/lib/compress/zstd_fast.h
index 4205141a9aa0b9176178c1443f10ef0c460e76a9..d8b7771954d591e73bef6ac680a3f5e9a1a727f3 100644 (file)
--- a/lib/compress/zstd_fast.h
+++ b/lib/compress/zstd_fast.h
@@ -11,12 +11,13 @@
 #ifndef ZSTD_FAST_H
 #define ZSTD_FAST_H
 
-#include "zstd_compress.h"
-
 #if defined (__cplusplus)
 extern "C" {
 #endif
 
+#include "mem.h"      /* U32 */
+#include "zstd.h"     /* ZSTD_CCtx, size_t */
+
 void ZSTD_fillHashTable(ZSTD_CCtx* zc, const void* end, const U32 mls);
 size_t ZSTD_compressBlock_fast(ZSTD_CCtx* ctx,
                          const void* src, size_t srcSize);

diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c
index 2a7f6a0fe2be9cf0113e4a00562fe3737a6cf951..d80e06f7de9575798a3f39b12685c38a165a5ef3 100644 (file)
--- a/lib/compress/zstd_lazy.c
+++ b/lib/compress/zstd_lazy.c
@@ -8,6 +8,7 @@
  * You may select, at your option, one of the above-listed licenses.
  */
 
+#include "zstd_compress_internal.h"
 #include "zstd_lazy.h"
 
 

diff --git a/lib/compress/zstd_lazy.h b/lib/compress/zstd_lazy.h
index a9c4daed25829a64ec193eab89994f0efe19fa07..74e1fd6970268de6321f3662206ec2169d5bb002 100644 (file)
--- a/lib/compress/zstd_lazy.h
+++ b/lib/compress/zstd_lazy.h
@@ -11,12 +11,13 @@
 #ifndef ZSTD_LAZY_H
 #define ZSTD_LAZY_H
 
-#include "zstd_compress.h"
-
 #if defined (__cplusplus)
 extern "C" {
 #endif
 
+#include "mem.h"    /* U32 */
+#include "zstd.h"   /* ZSTD_CCtx, size_t */
+
 U32 ZSTD_insertAndFindFirstIndex (ZSTD_CCtx* zc, const BYTE* ip, U32 mls);
 void ZSTD_updateTree(ZSTD_CCtx* zc, const BYTE* const ip, const BYTE* const iend, const U32 nbCompares, const U32 mls);
 void ZSTD_updateTree_extDict(ZSTD_CCtx* zc, const BYTE* const ip, const BYTE* const iend, const U32 nbCompares, const U32 mls);

diff --git a/lib/compress/zstd_ldm.h b/lib/compress/zstd_ldm.h
index d6d3d42c337f83092ed153455aa8fa9bda1cd171..8f12c677aacb8cdefe6866b4909a28cfcd16450b 100644 (file)
--- a/lib/compress/zstd_ldm.h
+++ b/lib/compress/zstd_ldm.h
@@ -10,12 +10,13 @@
 #ifndef ZSTD_LDM_H
 #define ZSTD_LDM_H
 
-#include "zstd_compress.h"
-
 #if defined (__cplusplus)
 extern "C" {
 #endif
 
+#include "zstd_compress_internal.h"   /* ldmParams_t, U32 */
+#include "zstd.h"   /* ZSTD_CCtx, size_t */
+
 /*-*************************************
 *  Long distance matching
 ***************************************/

diff --git a/lib/compress/zstd_opt.c b/lib/compress/zstd_opt.c
index e349bb9936ca76c58f4cd7fcee2b0ec3e76ffeb4..f416c15ff06b1077423dd8767ed0050e63190666 100644 (file)
--- a/lib/compress/zstd_opt.c
+++ b/lib/compress/zstd_opt.c
@@ -8,8 +8,9 @@
  * You may select, at your option, one of the above-listed licenses.
  */
 
+#include "zstd_compress_internal.h"
 #include "zstd_opt.h"
-#include "zstd_lazy.h"
+#include "zstd_lazy.h"   /* ZSTD_updateTree, ZSTD_updateTree_extDict */
 
 
 #define ZSTD_LITFREQ_ADD    2

diff --git a/lib/compress/zstd_opt.h b/lib/compress/zstd_opt.h
index 816a1fabbf1633f8675c6868a2dc61933f17da91..82e810c29361e4a743877dc5ecbe51fee2a61fbf 100644 (file)
--- a/lib/compress/zstd_opt.h
+++ b/lib/compress/zstd_opt.h
@@ -11,12 +11,12 @@
 #ifndef ZSTD_OPT_H
 #define ZSTD_OPT_H
 
-#include "zstd_compress.h"
-
 #if defined (__cplusplus)
 extern "C" {
 #endif
 
+#include "zstd.h"   /* ZSTD_CCtx, size_t */
+
 size_t ZSTD_compressBlock_btopt(ZSTD_CCtx* ctx, const void* src, size_t srcSize);
 size_t ZSTD_compressBlock_btultra(ZSTD_CCtx* ctx, const void* src, size_t srcSize);
 

diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c
index eb17f970146f67d7825e35d999cdfff9f07b581b..0b9173f3b48d8f094fc40bcdd7a5d44ccef15748 100644 (file)
--- a/lib/compress/zstdmt_compress.c
+++ b/lib/compress/zstdmt_compress.c
@@ -24,7 +24,7 @@
 #include <string.h>      /* memcpy, memset */
 #include "pool.h"        /* threadpool */
 #include "threading.h"   /* mutex */
-#include "zstd_compress.h"  /* MIN, ERROR, ZSTD_*, ZSTD_highbit32 */
+#include "zstd_compress_internal.h"  /* MIN, ERROR, ZSTD_*, ZSTD_highbit32 */
 #include "zstdmt_compress.h"