diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-09-20 07:58:12 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-09-20 07:58:12 +0100 |
commit | 0050cedd31961425907fc655056ad36bb73b61fe (patch) | |
tree | ff5af69f2b56ec80a89f95cf56542c1ba696d155 /contrib/zstd/fse_decompress.c | |
parent | 8e28ab597f8cd87358c9b5a674cfbdd789385dfb (diff) | |
download | rspamd-0050cedd31961425907fc655056ad36bb73b61fe.tar.gz rspamd-0050cedd31961425907fc655056ad36bb73b61fe.zip |
[Minor] Update bundled zstd
Diffstat (limited to 'contrib/zstd/fse_decompress.c')
-rw-r--r-- | contrib/zstd/fse_decompress.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/contrib/zstd/fse_decompress.c b/contrib/zstd/fse_decompress.c index 8474a4c07..8e3f0035f 100644 --- a/contrib/zstd/fse_decompress.c +++ b/contrib/zstd/fse_decompress.c @@ -34,34 +34,15 @@ /* ************************************************************** -* Compiler specifics -****************************************************************/ -#ifdef _MSC_VER /* Visual Studio */ -# define FORCE_INLINE static __forceinline -# include <intrin.h> /* For Visual 2005 */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -# pragma warning(disable : 4214) /* disable: C4214: non-int bitfields */ -#else -# if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ -# ifdef __GNUC__ -# define FORCE_INLINE static inline __attribute__((always_inline)) -# else -# define FORCE_INLINE static inline -# endif -# else -# define FORCE_INLINE static -# endif /* __STDC_VERSION__ */ -#endif - - -/* ************************************************************** * Includes ****************************************************************/ #include <stdlib.h> /* malloc, free, qsort */ #include <string.h> /* memcpy, memset */ #include "bitstream.h" +#include "compiler.h" #define FSE_STATIC_LINKING_ONLY #include "fse.h" +#include "error_private.h" /* ************************************************************** @@ -216,7 +197,7 @@ size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits) return 0; } -FORCE_INLINE size_t FSE_decompress_usingDTable_generic( +FORCE_INLINE_TEMPLATE size_t FSE_decompress_usingDTable_generic( void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const FSE_DTable* dt, const unsigned fast) |