[1.5.0] Move `zstd_errors.h` and `zdict.h` to `lib/` root

`zstd_errors.h` and `zdict.h` are public headers, so they deserve to be
in the root `lib/` directory with `zstd.h`, not mixed in with our private
headers.

diff --git a/build/VS2008/fullbench/fullbench.vcproj b/build/VS2008/fullbench/fullbench.vcproj
index 5752643f9d12c9ada0f838611dcc4fa7ba2168c6..5e349dce95644ff02f7bf4177ef0c5cd29e0e2c5 100644 (file)
--- a/build/VS2008/fullbench/fullbench.vcproj
+++ b/build/VS2008/fullbench/fullbench.vcproj
@@ -463,7 +463,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File

diff --git a/build/VS2008/fuzzer/fuzzer.vcproj b/build/VS2008/fuzzer/fuzzer.vcproj
index d48bc0fab48e9135d37a741ecc9b2f2ec76286e3..32f284684737150e41a2115368f54d52857f6b45 100644 (file)
--- a/build/VS2008/fuzzer/fuzzer.vcproj
+++ b/build/VS2008/fuzzer/fuzzer.vcproj
@@ -483,7 +483,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File
@@ -511,7 +511,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\dictBuilder\zdict.h"
+                               RelativePath="..\..\..\lib\zdict.h"
                                >
                        </File>
                        <File

diff --git a/build/VS2008/zstd/zstd.vcproj b/build/VS2008/zstd/zstd.vcproj
index 6f2652902e13eccfa2613e062dd6729d0688c3a3..c7eec577db38a6966e31e8a0c0edbe3ef0030dfa 100644 (file)
--- a/build/VS2008/zstd/zstd.vcproj
+++ b/build/VS2008/zstd/zstd.vcproj
@@ -559,7 +559,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\dictBuilder\zdict.h"
+                               RelativePath="..\..\..\lib\zdict.h"
                                >
                        </File>
                        <File
@@ -575,7 +575,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File

diff --git a/build/VS2008/zstdlib/zstdlib.vcproj b/build/VS2008/zstdlib/zstdlib.vcproj
index 5eb49f9b270c9d483a0edcfdedb028b45ee8da97..88c1aee26d507bfe27461fa82a660a4156b7daf1 100644 (file)
--- a/build/VS2008/zstdlib/zstdlib.vcproj
+++ b/build/VS2008/zstdlib/zstdlib.vcproj
@@ -495,7 +495,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File
@@ -523,7 +523,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\dictBuilder\zdict.h"
+                               RelativePath="..\..\..\lib\zdict.h"
                                >
                        </File>
                        <File

diff --git a/build/VS2010/fullbench/fullbench.vcxproj b/build/VS2010/fullbench/fullbench.vcxproj
index 20932fa37f818427b5be8c3f81f92836fa3ac140..2e0a042b0e82b98e61543a4ee168ba2600d2f3ba 100644 (file)
--- a/build/VS2010/fullbench/fullbench.vcxproj
+++ b/build/VS2010/fullbench/fullbench.vcxproj
@@ -190,7 +190,7 @@
     <ClInclude Include="..\..\..\lib\zstd.h" />
     <ClInclude Include="..\..\..\lib\common\fse.h" />
     <ClInclude Include="..\..\..\lib\common\huf.h" />
-    <ClInclude Include="..\..\..\lib\common\zstd_errors.h" />
+    <ClInclude Include="..\..\..\lib\zstd_errors.h" />
     <ClInclude Include="..\..\..\lib\common\zstd_internal.h" />
     <ClInclude Include="..\..\..\lib\common\pool.h" />
     <ClInclude Include="..\..\..\lib\common\threading.h" />

diff --git a/build/VS2010/fuzzer/fuzzer.vcxproj b/build/VS2010/fuzzer/fuzzer.vcxproj
index 8427572817d5471a0b1d73bf5efbabb95aa87ab8..91974ec7fa21e8680efef0cd7b7569f273b48476 100644 (file)
--- a/build/VS2010/fuzzer/fuzzer.vcxproj
+++ b/build/VS2010/fuzzer/fuzzer.vcxproj
@@ -196,7 +196,7 @@
     <ClInclude Include="..\..\..\lib\common\huf.h" />
     <ClInclude Include="..\..\..\lib\common\xxhash.h" />
     <ClInclude Include="..\..\..\lib\common\zstd_internal.h" />
-    <ClInclude Include="..\..\..\lib\common\zstd_errors.h" />
+    <ClInclude Include="..\..\..\lib\zstd_errors.h" />
     <ClInclude Include="..\..\..\lib\zstd.h" />
     <ClInclude Include="..\..\..\lib\compress\zstd_compress.h" />
     <ClInclude Include="..\..\..\lib\compress\zstd_compress_literals.h" />
@@ -211,7 +211,7 @@
     <ClInclude Include="..\..\..\lib\compress\zstdmt_compress.h" />
     <ClInclude Include="..\..\..\lib\decompress\zstd_ddict.h" />
     <ClInclude Include="..\..\..\lib\dictBuilder\divsufsort.h" />
-    <ClInclude Include="..\..\..\lib\dictBuilder\zdict.h" />
+    <ClInclude Include="..\..\..\lib\zdict.h" />
     <ClInclude Include="..\..\..\lib\dictBuilder\cover.h" />
     <ClInclude Include="..\..\..\lib\legacy\zstd_legacy.h" />
     <ClInclude Include="..\..\..\programs\datagen.h" />

diff --git a/build/VS2010/libzstd-dll/libzstd-dll.vcxproj b/build/VS2010/libzstd-dll/libzstd-dll.vcxproj
index 79ae9d32761361848fb04479f6364d4c31c82a56..a0aa897ce01b8285a6dfb0a9ce1d5caa90fcd9e3 100644 (file)
--- a/build/VS2010/libzstd-dll/libzstd-dll.vcxproj
+++ b/build/VS2010/libzstd-dll/libzstd-dll.vcxproj
@@ -61,7 +61,7 @@
     <ClInclude Include="..\..\..\lib\common\threading.h" />
     <ClInclude Include="..\..\..\lib\common\bitstream.h" />
     <ClInclude Include="..\..\..\lib\common\error_private.h" />
-    <ClInclude Include="..\..\..\lib\common\zstd_errors.h" />
+    <ClInclude Include="..\..\..\lib\zstd_errors.h" />
     <ClInclude Include="..\..\..\lib\common\mem.h" />
     <ClInclude Include="..\..\..\lib\common\fse.h" />
     <ClInclude Include="..\..\..\lib\common\huf.h" />

diff --git a/build/VS2010/libzstd/libzstd.vcxproj b/build/VS2010/libzstd/libzstd.vcxproj
index c4df5ddaa450050fa3a524fea8192bb3b42511bd..17c08d703614606335250ae44201e8adbce52ff8 100644 (file)
--- a/build/VS2010/libzstd/libzstd.vcxproj
+++ b/build/VS2010/libzstd/libzstd.vcxproj
@@ -61,7 +61,7 @@
     <ClInclude Include="..\..\..\lib\common\threading.h" />
     <ClInclude Include="..\..\..\lib\common\bitstream.h" />
     <ClInclude Include="..\..\..\lib\common\error_private.h" />
-    <ClInclude Include="..\..\..\lib\common\zstd_errors.h" />
+    <ClInclude Include="..\..\..\lib\zstd_errors.h" />
     <ClInclude Include="..\..\..\lib\common\mem.h" />
     <ClInclude Include="..\..\..\lib\common\fse.h" />
     <ClInclude Include="..\..\..\lib\common\huf.h" />

diff --git a/build/VS2010/zstd/zstd.vcxproj b/build/VS2010/zstd/zstd.vcxproj
index e389f9693ca3e356025d26d47c259bf64165745f..46e22f42e9b643104c0056e5e1229bd61e5da7e7 100644 (file)
--- a/build/VS2010/zstd/zstd.vcxproj
+++ b/build/VS2010/zstd/zstd.vcxproj
@@ -70,14 +70,14 @@
     <ClInclude Include="..\..\..\lib\common\threading.h" />
     <ClInclude Include="..\..\..\lib\common\xxhash.h" />
     <ClInclude Include="..\..\..\lib\compress\zstdmt_compress.h" />
-    <ClInclude Include="..\..\..\lib\dictBuilder\zdict.h" />
+    <ClInclude Include="..\..\..\lib\zdict.h" />
     <ClInclude Include="..\..\..\lib\dictBuilder\cover.h" />
     <ClInclude Include="..\..\..\lib\dictBuilder\divsufsort.h" />
     <ClInclude Include="..\..\..\lib\common\fse.h" />
     <ClInclude Include="..\..\..\lib\common\huf.h" />
     <ClInclude Include="..\..\..\lib\zstd.h" />
     <ClInclude Include="..\..\..\lib\common\zstd_internal.h" />
-    <ClInclude Include="..\..\..\lib\common\zstd_errors.h" />
+    <ClInclude Include="..\..\..\lib\zstd_errors.h" />
     <ClInclude Include="..\..\..\lib\compress\zstd_compress.h" />
     <ClInclude Include="..\..\..\lib\compress\zstd_compress_literals.h" />
     <ClInclude Include="..\..\..\lib\compress\zstd_compress_sequences.h" />

diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 179c9762452cab0bff9de6e5d4b8e1c6f2431783..d58c652a1af3e60d716864473a678be7d3ad2eb4 100644 (file)
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -162,8 +162,8 @@ endif ()
 # install target
 install(FILES
     "${LIBRARY_DIR}/zstd.h"
-    "${LIBRARY_DIR}/dictBuilder/zdict.h"
-    "${LIBRARY_DIR}/common/zstd_errors.h"
+    "${LIBRARY_DIR}/zdict.h"
+    "${LIBRARY_DIR}/zstd_errors.h"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 install(TARGETS ${library_targets}

diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build
index 3580229800084f987485e5c1e61e76034e81ba15..2cbd39cf25af9c9bcfd2ad994590701c8692dd60 100644 (file)
--- a/build/meson/lib/meson.build
+++ b/build/meson/lib/meson.build
@@ -124,5 +124,5 @@ pkgconfig.generate(libzstd,
   url: 'http://www.zstd.net/')
 
 install_headers(join_paths(zstd_rootdir, 'lib/zstd.h'),
-  join_paths(zstd_rootdir, 'lib/dictBuilder/zdict.h'),
-  join_paths(zstd_rootdir, 'lib/common/zstd_errors.h'))
+  join_paths(zstd_rootdir, 'lib/zdict.h'),
+  join_paths(zstd_rootdir, 'lib/zstd_errors.h'))

diff --git a/contrib/VS2005/fullbench/fullbench.vcproj b/contrib/VS2005/fullbench/fullbench.vcproj
index c67490c6f449bca395a76ba93f51707797610357..98f8593769a93fa9c4e5a6e5ae1ba1fadeac4c80 100644 (file)
--- a/contrib/VS2005/fullbench/fullbench.vcproj
+++ b/contrib/VS2005/fullbench/fullbench.vcproj
@@ -390,7 +390,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File

diff --git a/contrib/VS2005/fuzzer/fuzzer.vcproj b/contrib/VS2005/fuzzer/fuzzer.vcproj
index c64c5037aad00f3fa87a49e97e9e92aa6b3d901a..d182535fe2d7a1585aa8ed7e61e2851f21447589 100644 (file)
--- a/contrib/VS2005/fuzzer/fuzzer.vcproj
+++ b/contrib/VS2005/fuzzer/fuzzer.vcproj
@@ -426,7 +426,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File
@@ -454,7 +454,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\dictBuilder\zdict.h"
+                               RelativePath="..\..\..\lib\zdict.h"
                                >
                        </File>
                        <File

diff --git a/contrib/VS2005/zstd/zstd.vcproj b/contrib/VS2005/zstd/zstd.vcproj
index 46cabbf6e3ddef7938ea748471f6bfaf91ca0cdb..78645d18a360ba910b3954b8679ddb3e3daae104 100644 (file)
--- a/contrib/VS2005/zstd/zstd.vcproj
+++ b/contrib/VS2005/zstd/zstd.vcproj
@@ -454,7 +454,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File
@@ -482,7 +482,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\dictBuilder\zdict.h"
+                               RelativePath="..\..\..\lib\zdict.h"
                                >
                        </File>
                        <File

diff --git a/contrib/VS2005/zstdlib/zstdlib.vcproj b/contrib/VS2005/zstdlib/zstdlib.vcproj
index 30a02f584a8a1b0d51e29d60db3b635081c85df7..e028bd677e76363d4d51011fe159cbf9a4f8cbd9 100644 (file)
--- a/contrib/VS2005/zstdlib/zstdlib.vcproj
+++ b/contrib/VS2005/zstdlib/zstdlib.vcproj
@@ -446,7 +446,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\common\zstd_errors.h"
+                               RelativePath="..\..\..\lib\zstd_errors.h"
                                >
                        </File>
                        <File
@@ -478,7 +478,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\lib\dictBuilder\zdict.h"
+                               RelativePath="..\..\..\lib\zdict.h"
                                >
                        </File>
                        <File

diff --git a/contrib/freestanding_lib/freestanding.py b/contrib/freestanding_lib/freestanding.py
index a3a015db1f339de279dd0fef72d8008b395b3ca0..1971687214f40a3370fb68ae9a1bef591c6ba294 100755 (executable)
--- a/contrib/freestanding_lib/freestanding.py
+++ b/contrib/freestanding_lib/freestanding.py
@@ -481,6 +481,7 @@ class Freestanding(object):
         assert os.path.exists(self._src_lib)
         os.makedirs(self._dst_lib, exist_ok=True)
         self._copy_file("zstd.h")
+        self._copy_file("zstd_errors.h")
         for subdir in INCLUDED_SUBDIRS:
             src_dir = os.path.join(self._src_lib, subdir)
             dst_dir = os.path.join(self._dst_lib, subdir)

diff --git a/contrib/linux-kernel/Makefile b/contrib/linux-kernel/Makefile
index 2ea370d372f291da2728448db2f169a8e602bd73..c391df7c0f2d33d2d9f3e49d7b4da370f4c06a73 100644 (file)
--- a/contrib/linux-kernel/Makefile
+++ b/contrib/linux-kernel/Makefile
@@ -23,7 +23,7 @@ libzstd:
                --rewrite-include '<limits\.h>=<linux/limits.h>' \
                --rewrite-include '<stddef\.h>=<linux/types.h>' \
                --rewrite-include '"\.\./zstd.h"=<linux/zstd.h>' \
-               --rewrite-include '"(\.\./common/)?zstd_errors.h"=<linux/zstd_errors.h>' \
+               --rewrite-include '"(\.\./)?zstd_errors.h"=<linux/zstd_errors.h>' \
                --sed 's,/\*\*\*,/* *,g' \
                --sed 's,/\*\*,/*,g' \
                -DZSTD_NO_INTRINSICS \
@@ -54,7 +54,7 @@ libzstd:
                -DZSTD_TRACE=0 \
                -DZSTD_NO_TRACE
        mv linux/lib/zstd/zstd.h linux/include/linux/zstd_lib.h
-       mv linux/lib/zstd/common/zstd_errors.h linux/include/linux/
+       mv linux/lib/zstd/zstd_errors.h linux/include/linux/
        cp linux_zstd.h linux/include/linux/zstd.h
        cp zstd_compress_module.c linux/lib/zstd
        cp zstd_decompress_module.c linux/lib/zstd
@@ -80,7 +80,7 @@ import-upstream:
        cp -r ../../lib/common $(LINUX)/lib/zstd
        cp -r ../../lib/compress $(LINUX)/lib/zstd
        cp -r ../../lib/decompress $(LINUX)/lib/zstd
-       mv $(LINUX)/lib/zstd/common/zstd_errors.h $(LINUX)/include/linux
+       mv $(LINUX)/lib/zstd/zstd_errors.h $(LINUX)/include/linux
        rm $(LINUX)/lib/zstd/common/threading.*
        rm $(LINUX)/lib/zstd/common/pool.*
        rm $(LINUX)/lib/zstd/common/xxhash.*

diff --git a/lib/BUCK b/lib/BUCK
index 637c20d667c68990f0ad85ea74d4f5e8b154c05c..60c6bbb54d9129a76f51db1d43a2fe2deaf5a3bf 100644 (file)
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -65,9 +65,7 @@ cxx_library(
     name='zdict',
     header_namespace='',
     visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('dictBuilder', 'zdict.h'),
-    ]),
+    exported_headers=['zdict.h'],
     headers=subdir_glob([
         ('dictBuilder', 'divsufsort.h'),
         ('dictBuilder', 'cover.h'),
@@ -131,10 +129,10 @@ cxx_library(
     name='errors',
     header_namespace='',
     visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'error_private.h'),
-        ('common', 'zstd_errors.h'),
-    ]),
+    exported_headers=[
+        'zstd_errors.h',
+        'common/error_private.h',
+    ]
     srcs=['common/error_private.c'],
 )
 

diff --git a/lib/Makefile b/lib/Makefile
index 6a26e6c7927c9dd059a7f1f58885cd805f545394..4371710a17dd9fccdc3562c0a29f8157bbb2dddc 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -435,8 +435,8 @@ install-includes:
        [ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
        @echo Installing includes
        $(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) zdict.h $(DESTDIR)$(INCLUDEDIR)
 
 .PHONY: uninstall
 uninstall:

diff --git a/lib/README.md b/lib/README.md
index db9170a75c42baffcbe7caa567812e492dc38ff1..cbf3f01b1c3d29708d70c87211e18730647e2303 100644 (file)
--- a/lib/README.md
+++ b/lib/README.md
@@ -42,8 +42,8 @@ Zstandard's stable API is exposed within [lib/zstd.h](zstd.h).
 
 Optional advanced features are exposed via :
 
-- `lib/common/zstd_errors.h` : translates `size_t` function results
-                               into a `ZSTD_ErrorCode`, for accurate error handling.
+- `lib/zstd_errors.h` : translates `size_t` function results
+                        into a `ZSTD_ErrorCode`, for accurate error handling.
 
 - `ZSTD_STATIC_LINKING_ONLY` : if this macro is defined _before_ including `zstd.h`,
                           it unlocks access to the experimental API,

diff --git a/lib/common/error_private.h b/lib/common/error_private.h
index ae964cf4d63baa20cc13c303d0942d22d41381cb..6d8b9f776339003404ad9189629928da7ee96ec0 100644 (file)
--- a/lib/common/error_private.h
+++ b/lib/common/error_private.h
@@ -21,8 +21,8 @@ extern "C" {
 /* ****************************************
 *  Dependencies
 ******************************************/
-#include "zstd_deps.h"    /* size_t */
-#include "zstd_errors.h"  /* enum list */
+#include "../zstd_errors.h"  /* enum list */
+#include "zstd_deps.h"       /* size_t */
 
 
 /* ****************************************

diff --git a/lib/dictBuilder/cover.c b/lib/dictBuilder/cover.c
index ac297c5543ad0a2740580d8a8b69f7573bd9f6d5..8364444d15933019d7692b35044557dc69473b85 100644 (file)
--- a/lib/dictBuilder/cover.c
+++ b/lib/dictBuilder/cover.c
@@ -26,15 +26,16 @@
 #include <string.h> /* memset */
 #include <time.h>   /* clock */
 
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+
 #include "../common/mem.h" /* read */
 #include "../common/pool.h"
 #include "../common/threading.h"
-#include "cover.h"
 #include "../common/zstd_internal.h" /* includes zstd.h */
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
+#include "../zdict.h"
+#include "cover.h"
 
 /*-*************************************
 *  Constants

diff --git a/lib/dictBuilder/cover.h b/lib/dictBuilder/cover.h
index 49411032139619f3d2cd8f64e0561e6d5deb5ed7..1aacdddd6fe488ae9b86c56a2f8cd2dcd24239c3 100644 (file)
--- a/lib/dictBuilder/cover.h
+++ b/lib/dictBuilder/cover.h
@@ -8,6 +8,10 @@
  * You may select, at your option, one of the above-listed licenses.
  */
 
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* malloc, free, qsort */
 #include <string.h> /* memset */
@@ -16,10 +20,7 @@
 #include "../common/pool.h"
 #include "../common/threading.h"
 #include "../common/zstd_internal.h" /* includes zstd.h */
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
+#include "../zdict.h"
 
 /**
  * COVER_best_t is used for two purposes:

diff --git a/lib/dictBuilder/fastcover.c b/lib/dictBuilder/fastcover.c
index 4a1d5f8f8f70a79cf39597bc6441770bd8b6b6ab..ed789f92f485238bd6e7124161605f831cfcdd03 100644 (file)
--- a/lib/dictBuilder/fastcover.c
+++ b/lib/dictBuilder/fastcover.c
@@ -16,16 +16,17 @@
 #include <string.h> /* memset */
 #include <time.h>   /* clock */
 
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+
 #include "../common/mem.h" /* read */
 #include "../common/pool.h"
 #include "../common/threading.h"
-#include "cover.h"
 #include "../common/zstd_internal.h" /* includes zstd.h */
 #include "../compress/zstd_compress_internal.h" /* ZSTD_hash*() */
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
+#include "../zdict.h"
+#include "cover.h"
 
 
 /*-*************************************

diff --git a/lib/dictBuilder/zdict.c b/lib/dictBuilder/zdict.c
index a5e5e51f4bfd06a720adc414f3194afa995349a5..459cbe4d19b98762f2b18074a4829e63e1f425f4 100644 (file)
--- a/lib/dictBuilder/zdict.c
+++ b/lib/dictBuilder/zdict.c
@@ -41,18 +41,19 @@
 #include <stdio.h>         /* fprintf, fopen, ftello64 */
 #include <time.h>          /* clock */
 
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+#define HUF_STATIC_LINKING_ONLY
+
 #include "../common/mem.h"           /* read */
 #include "../common/fse.h"           /* FSE_normalizeCount, FSE_writeNCount */
-#define HUF_STATIC_LINKING_ONLY
 #include "../common/huf.h"           /* HUF_buildCTable, HUF_writeCTable */
 #include "../common/zstd_internal.h" /* includes zstd.h */
 #include "../common/xxhash.h"        /* XXH64 */
-#include "divsufsort.h"
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#  define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
 #include "../compress/zstd_compress_internal.h" /* ZSTD_loadCEntropy() */
+#include "../zdict.h"
+#include "divsufsort.h"
 
 
 /*-*************************************

diff --git a/lib/dictBuilder/zdict.h b/lib/zdict.h
similarity index 100%
rename from lib/dictBuilder/zdict.h
rename to lib/zdict.h

diff --git a/lib/zstd.h b/lib/zstd.h
index ac572210148c85483432d6d71257a9a9acd25694..8f88bd122d58e681242f72641238816e4e9e6e06 100644 (file)
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@ -815,7 +815,7 @@ ZSTDLIB_API size_t ZSTD_DStreamOutSize(void);   /*!< recommended size for output
 /*! ZSTD_compress_usingDict() :
  *  Compression at an explicit compression level using a Dictionary.
  *  A dictionary can be any arbitrary data segment (also called a prefix),
- *  or a buffer with specified information (see dictBuilder/zdict.h).
+ *  or a buffer with specified information (see zdict.h).
  *  Note : This function loads the dictionary, resulting in significant startup delay.
  *         It's intended for a dictionary used only once.
  *  Note 2 : When `dict == NULL || dictSize < 8` no dictionary is used. */
@@ -1845,7 +1845,7 @@ ZSTDLIB_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* pre
 
 /* ZSTD_c_splitBlocks
  * Default is 0 == disabled. Set to 1 to enable block splitting.
- * 
+ *
  * Will attempt to split blocks in order to improve compression ratio at the cost of speed.
  */
 #define ZSTD_c_splitBlocks ZSTD_c_experimentalParam13
@@ -1853,11 +1853,11 @@ ZSTDLIB_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* pre
 /* ZSTD_c_useRowMatchFinder
  * Default is ZSTD_urm_auto.
  * Controlled with ZSTD_useRowMatchFinderMode_e enum.
- * 
+ *
  * By default, in ZSTD_urm_auto, when finalizing the compression parameters, the library
  * will decide at runtime whether to use the row-based matchfinder based on support for SIMD
  * instructions as well as the windowLog.
- * 
+ *
  * Set to ZSTD_urm_disableRowMatchFinder to never use row-based matchfinder.
  * Set to ZSTD_urm_enableRowMatchFinder to force usage of row-based matchfinder.
  */

diff --git a/lib/common/zstd_errors.h b/lib/zstd_errors.h
similarity index 100%
rename from lib/common/zstd_errors.h
rename to lib/zstd_errors.h

diff --git a/programs/benchzstd.c b/programs/benchzstd.c
index c40f0a24cc6a8e7cc556de0eed19a2a00be96c12..ccf705d292861b07699161b83d5613932a14272d 100644 (file)
--- a/programs/benchzstd.c
+++ b/programs/benchzstd.c
@@ -36,7 +36,7 @@
 #include "datagen.h"     /* RDG_genBuffer */
 #include "../lib/common/xxhash.h"
 #include "benchzstd.h"
-#include "../lib/common/zstd_errors.h"
+#include "../lib/zstd_errors.h"
 
 
 /* *************************************

diff --git a/programs/dibio.h b/programs/dibio.h
index dfc8f27a1795a2f94ae0f8d56f3130482e5c314b..f65ed9b8e06434de98578ffadedab1a565356036 100644 (file)
--- a/programs/dibio.h
+++ b/programs/dibio.h
@@ -19,7 +19,7 @@
 *  Dependencies
 ***************************************/
 #define ZDICT_STATIC_LINKING_ONLY
-#include "../lib/dictBuilder/zdict.h"     /* ZDICT_params_t */
+#include "../lib/zdict.h"     /* ZDICT_params_t */
 
 
 /*-*************************************

diff --git a/programs/fileio.c b/programs/fileio.c
index fab7918d7b7bdd95124f81c9688e38829157e238..604084cc707afa7363dda3686299fc030c1f92d8 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -44,7 +44,7 @@
 
 #define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_magicNumber, ZSTD_frameHeaderSize_max */
 #include "../lib/zstd.h"
-#include "../lib/common/zstd_errors.h"  /* ZSTD_error_frameParameter_windowTooLarge */
+#include "../lib/zstd_errors.h"  /* ZSTD_error_frameParameter_windowTooLarge */
 
 #if defined(ZSTD_GZCOMPRESS) || defined(ZSTD_GZDECOMPRESS)
 #  include <zlib.h>