diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2017-08-18 17:46:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-18 17:46:59 (GMT) |
| commit | 839cf7785832eb827ed77fa2b931b42778f0dcf7 (patch) | |
| tree | b5d6f7e6ac63283abf00011b2d0fcdda56f74621 /lib/xxhash.c | |
| parent | 7bb64ff2b69a9f8367de9ab483cdadf42b4c1b65 (diff) | |
| parent | c10863b98e1503af90616ae99725ecd120265dfb (diff) | |
| download | lz4-839cf7785832eb827ed77fa2b931b42778f0dcf7.zip lz4-839cf7785832eb827ed77fa2b931b42778f0dcf7.tar.gz lz4-839cf7785832eb827ed77fa2b931b42778f0dcf7.tar.bz2 | |
Merge pull request #384 from lz4/dev
v1.8.0
Diffstat (limited to 'lib/xxhash.c')
| -rw-r--r-- | lib/xxhash.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/lib/xxhash.c b/lib/xxhash.c index e9ff2d4..a532358 100644 --- a/lib/xxhash.c +++ b/lib/xxhash.c @@ -113,19 +113,24 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcp ***************************************/ #ifdef _MSC_VER /* Visual Studio */ # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -# define FORCE_INLINE static __forceinline -#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 +#ifndef FORCE_INLINE +# ifdef _MSC_VER /* Visual Studio */ +# define FORCE_INLINE static __forceinline +# 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 /* _MSC_VER */ +#endif /* FORCE_INLINE */ + /* ************************************* * Basic Types |