facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove STATIC_LINKING_ONLY defines

Browse Source
This commit is contained in:
Nick Terrell 2017-03-30 14:33:59 -07:00
parent 6ce58897da
commit e48b135521
14 changed files with 23 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/linux-kernel/include/zstd.h
View File

@ -315,11 +315,6 @@ ZSTDLIB_API size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* outp
ZSTDLIB_API size_t ZSTD_DStreamInSize(void); /*!< recommended size for input buffer */ ZSTDLIB_API size_t ZSTD_DStreamInSize(void); /*!< recommended size for input buffer */
ZSTDLIB_API size_t ZSTD_DStreamOutSize(void); /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */ ZSTDLIB_API size_t ZSTD_DStreamOutSize(void); /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */
#endif /* ZSTD_H_235446 */
#if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY)
#define ZSTD_H_ZSTD_STATIC_LINKING_ONLY
/**************************************************************************************** /****************************************************************************************
* START OF ADVANCED AND EXPERIMENTAL FUNCTIONS * START OF ADVANCED AND EXPERIMENTAL FUNCTIONS
@ -753,4 +748,4 @@ ZSTDLIB_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCa
ZSTDLIB_API size_t ZSTD_insertBlock(ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize); /**< insert block into `dctx` history. Useful for uncompressed blocks */ ZSTDLIB_API size_t ZSTD_insertBlock(ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize); /**< insert block into `dctx` history. Useful for uncompressed blocks */
#endif /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */ #endif /* ZSTD_H_235446 */

2
contrib/linux-kernel/lib/entropy_common.c
View File

@ -37,9 +37,7 @@
***************************************/ ***************************************/
#include "mem.h" #include "mem.h"
#include "error_private.h" /* ERR_*, ERROR */ #include "error_private.h" /* ERR_*, ERROR */
#define FSE_STATIC_LINKING_ONLY /* FSE_MIN_TABLELOG */
#include "fse.h" #include "fse.h"
#define HUF_STATIC_LINKING_ONLY /* HUF_TABLELOG_ABSOLUTEMAX */
#include "huf.h" #include "huf.h"

5
contrib/linux-kernel/lib/fse.h
View File

@ -286,8 +286,6 @@ If there is an error, the function will return an error code, which can be teste
*/ */
#ifdef FSE_STATIC_LINKING_ONLY
/* *** Dependency *** */ /* *** Dependency *** */
#include "bitstream.h" #include "bitstream.h"
@ -672,7 +670,4 @@ MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr)
#define FSE_TABLESTEP(tableSize) ((tableSize>>1) + (tableSize>>3) + 3) #define FSE_TABLESTEP(tableSize) ((tableSize>>1) + (tableSize>>3) + 3)
#endif /* FSE_STATIC_LINKING_ONLY */
#endif /* FSE_H */ #endif /* FSE_H */

1
contrib/linux-kernel/lib/fse_compress.c
View File

@ -43,7 +43,6 @@
****************************************************************/ ****************************************************************/
#include <linux/string.h> /* memcpy, memset */ #include <linux/string.h> /* memcpy, memset */
#include "bitstream.h" #include "bitstream.h"
#define FSE_STATIC_LINKING_ONLY
#include "fse.h" #include "fse.h"

1
contrib/linux-kernel/lib/fse_decompress.c
View File

@ -44,7 +44,6 @@
****************************************************************/ ****************************************************************/
#include <linux/string.h> /* memcpy, memset */ #include <linux/string.h> /* memcpy, memset */
#include "bitstream.h" #include "bitstream.h"
#define FSE_STATIC_LINKING_ONLY
#include "fse.h" #include "fse.h"

4
contrib/linux-kernel/lib/huf.h
View File

@ -91,8 +91,6 @@ size_t HUF_compress4X_wksp (void* dst, size_t dstSize, const void* src, size_t s
#ifdef HUF_STATIC_LINKING_ONLY
/* *** Dependencies *** */ /* *** Dependencies *** */
#include "mem.h" /* U32 */ #include "mem.h" /* U32 */
@ -246,6 +244,4 @@ size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize, const void* cS
size_t HUF_decompress1X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable); size_t HUF_decompress1X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
size_t HUF_decompress1X4_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable); size_t HUF_decompress1X4_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
#endif /* HUF_STATIC_LINKING_ONLY */
#endif /* HUF_H_298734234 */ #endif /* HUF_H_298734234 */

2
contrib/linux-kernel/lib/huf_compress.c
View File

@ -38,9 +38,7 @@
****************************************************************/ ****************************************************************/
#include <linux/string.h> /* memcpy, memset */ #include <linux/string.h> /* memcpy, memset */
#include "bitstream.h" #include "bitstream.h"
#define FSE_STATIC_LINKING_ONLY /* FSE_optimalTableLog_internal */
#include "fse.h" /* header compression */ #include "fse.h" /* header compression */
#define HUF_STATIC_LINKING_ONLY
#include "huf.h" #include "huf.h"

1
contrib/linux-kernel/lib/huf_decompress.c
View File

@ -44,7 +44,6 @@
#include <linux/string.h> /* memcpy, memset */ #include <linux/string.h> /* memcpy, memset */
#include "bitstream.h" /* BIT_* */ #include "bitstream.h" /* BIT_* */
#include "fse.h" /* header compression */ #include "fse.h" /* header compression */
#define HUF_STATIC_LINKING_ONLY
#include "huf.h" #include "huf.h"

3
contrib/linux-kernel/lib/xxhash.c
View File

@ -73,9 +73,6 @@ static void XXH_free (void* p) { free(p); }
#include <linux/string.h> #include <linux/string.h>
static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); } static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
#ifndef XXH_STATIC_LINKING_ONLY
# define XXH_STATIC_LINKING_ONLY
#endif
#include "xxhash.h" #include "xxhash.h"
#include "mem.h" #include "mem.h"

16
contrib/linux-kernel/lib/xxhash.h
View File

@ -206,9 +206,6 @@ XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t
XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src); XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src);
XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src); XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src);
#endif /* XXHASH_H_5627135585666179 */
/* ================================================================================================ /* ================================================================================================
This section contains definitions which are not guaranteed to remain stable. This section contains definitions which are not guaranteed to remain stable.
@ -216,14 +213,11 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src
They shall only be used with static linking. They shall only be used with static linking.
Never use these definitions in association with dynamic linking ! Never use these definitions in association with dynamic linking !
=================================================================================================== */ =================================================================================================== */
#if defined(XXH_STATIC_LINKING_ONLY) && !defined(XXH_STATIC_H_3543687687345)
#define XXH_STATIC_H_3543687687345
/* These definitions are only meant to allow allocation of XXH state /* These definitions are only meant to allow allocation of XXH state
statically, on stack, or in a struct for example. statically, on stack, or in a struct for example.
Do not use members directly. */ Do not use members directly. */
struct XXH32_state_s { struct XXH32_state_s {
unsigned total_len_32; unsigned total_len_32;
unsigned large_len; unsigned large_len;
unsigned v1; unsigned v1;
@ -233,9 +227,9 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src
unsigned mem32[4]; /* buffer defined as U32 for alignment */ unsigned mem32[4]; /* buffer defined as U32 for alignment */
unsigned memsize; unsigned memsize;
unsigned reserved; /* never read nor write, will be removed in a future version */ unsigned reserved; /* never read nor write, will be removed in a future version */
}; /* typedef'd to XXH32_state_t */ }; /* typedef'd to XXH32_state_t */
struct XXH64_state_s { struct XXH64_state_s {
unsigned long long total_len; unsigned long long total_len;
unsigned long long v1; unsigned long long v1;
unsigned long long v2; unsigned long long v2;
@ -244,6 +238,6 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src
unsigned long long mem64[4]; /* buffer defined as U64 for alignment */ unsigned long long mem64[4]; /* buffer defined as U64 for alignment */
unsigned memsize; unsigned memsize;
unsigned reserved[2]; /* never read nor write, will be removed in a future version */ unsigned reserved[2]; /* never read nor write, will be removed in a future version */
}; /* typedef'd to XXH64_state_t */ }; /* typedef'd to XXH64_state_t */
#endif /* XXH_STATIC_LINKING_ONLY && XXH_STATIC_H_3543687687345 */ #endif /* XXHASH_H_5627135585666179 */

1
contrib/linux-kernel/lib/zstd_common.c
View File

@ -13,7 +13,6 @@
* Dependencies * Dependencies
***************************************/ ***************************************/
#include "error_private.h" #include "error_private.h"
#define ZSTD_STATIC_LINKING_ONLY
#include "zstd.h" /* declaration of ZSTD_isError, ZSTD_getErrorName, ZSTD_getErrorCode, ZSTD_getErrorString, ZSTD_versionNumber */ #include "zstd.h" /* declaration of ZSTD_isError, ZSTD_getErrorName, ZSTD_getErrorCode, ZSTD_getErrorString, ZSTD_versionNumber */

2
contrib/linux-kernel/lib/zstd_compress.c
View File

@ -13,9 +13,7 @@
***************************************/ ***************************************/
#include <linux/string.h> /* memset */ #include <linux/string.h> /* memset */
#include "mem.h" #include "mem.h"
#define FSE_STATIC_LINKING_ONLY /* FSE_encodeSymbol */
#include "fse.h" #include "fse.h"
#define HUF_STATIC_LINKING_ONLY
#include "huf.h" #include "huf.h"
#include "zstd_internal.h" /* includes zstd.h */ #include "zstd_internal.h" /* includes zstd.h */

2
contrib/linux-kernel/lib/zstd_decompress.c
View File

@ -26,9 +26,7 @@
*********************************************************/ *********************************************************/
#include <linux/string.h> /* memcpy, memmove, memset */ #include <linux/string.h> /* memcpy, memmove, memset */
#include "mem.h" /* low level memory routines */ #include "mem.h" /* low level memory routines */
#define FSE_STATIC_LINKING_ONLY
#include "fse.h" #include "fse.h"
#define HUF_STATIC_LINKING_ONLY
#include "huf.h" #include "huf.h"
#include "zstd_internal.h" #include "zstd_internal.h"

4
contrib/linux-kernel/lib/zstd_internal.h
View File

@ -22,11 +22,7 @@
***************************************/ ***************************************/
#include "mem.h" #include "mem.h"
#include "error_private.h" #include "error_private.h"
#define ZSTD_STATIC_LINKING_ONLY
#include "zstd.h" #include "zstd.h"
#ifndef XXH_STATIC_LINKING_ONLY
# define XXH_STATIC_LINKING_ONLY /* XXH64_state_t */
#endif
#include "xxhash.h" /* XXH_reset, update, digest */ #include "xxhash.h" /* XXH_reset, update, digest */