diff options
| author | Rémi Verschelde | 2017-08-27 12:05:17 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-08-27 12:05:39 +0200 |
| commit | c3ab9eb590ca10b3b67dd4124047b6879ec73721 (patch) | |
| tree | 2d977b022aa0170d16c8ae999f4a8ea62d55851f /thirdparty/zstd/common/huf.h | |
| parent | 560fc0f19932a7b51e02e9eda8a64f284f41e6d0 (diff) | |
| download | godot-c3ab9eb590ca10b3b67dd4124047b6879ec73721.tar.gz godot-c3ab9eb590ca10b3b67dd4124047b6879ec73721.tar.zst godot-c3ab9eb590ca10b3b67dd4124047b6879ec73721.zip | |
zstd: Update to upstream version 1.3.1
It is now dual-licensed BSD-3-Clause and GPL-2.0, we use the former.
The PATENTS file is no longer applicable \o/
Also add zstd to COPYRIGHT.txt
Diffstat (limited to 'thirdparty/zstd/common/huf.h')
| -rw-r--r-- | thirdparty/zstd/common/huf.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/thirdparty/zstd/common/huf.h b/thirdparty/zstd/common/huf.h index dabd35991..2b3015a84 100644 --- a/thirdparty/zstd/common/huf.h +++ b/thirdparty/zstd/common/huf.h @@ -31,13 +31,13 @@ You can contact the author at : - Source repository : https://github.com/Cyan4973/FiniteStateEntropy ****************************************************************** */ -#ifndef HUF_H_298734234 -#define HUF_H_298734234 #if defined (__cplusplus) extern "C" { #endif +#ifndef HUF_H_298734234 +#define HUF_H_298734234 /* *** Dependencies *** */ #include <stddef.h> /* size_t */ @@ -124,6 +124,7 @@ HUF_PUBLIC_API size_t HUF_compress4X_wksp (void* dst, size_t dstCapacity, const #define HUF_DECOMPRESS_WORKSPACE_SIZE (2 << 10) #define HUF_DECOMPRESS_WORKSPACE_SIZE_U32 (HUF_DECOMPRESS_WORKSPACE_SIZE / sizeof(U32)) +#endif /* HUF_H_298734234 */ /* ****************************************************************** * WARNING !! @@ -132,7 +133,8 @@ HUF_PUBLIC_API size_t HUF_compress4X_wksp (void* dst, size_t dstCapacity, const * because they are not guaranteed to remain stable in the future. * Only consider them in association with static linking. *******************************************************************/ -#ifdef HUF_STATIC_LINKING_ONLY +#if defined(HUF_STATIC_LINKING_ONLY) && !defined(HUF_H_HUF_STATIC_LINKING_ONLY) +#define HUF_H_HUF_STATIC_LINKING_ONLY /* *** Dependencies *** */ #include "mem.h" /* U32 */ @@ -295,9 +297,6 @@ size_t HUF_decompress1X4_usingDTable(void* dst, size_t maxDstSize, const void* c #endif /* HUF_STATIC_LINKING_ONLY */ - #if defined (__cplusplus) } #endif - -#endif /* HUF_H_298734234 */ |