diff options
| author | Jonathan Corbet <[email protected]> | 2021-12-10 13:57:09 -0700 |
|---|---|---|
| committer | Jonathan Corbet <[email protected]> | 2021-12-10 13:57:09 -0700 |
| commit | a7fb920b158da0a154da609a4c27ff693404ec90 (patch) | |
| tree | 0637688614d7889aef9dd76870b9605d3f563247 /lib/zstd/common/compiler.h | |
| parent | ce881fc06dc87e73928ced4c37b6ac6b32ef5fb6 (diff) | |
| parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
Merge tag 'v5.16-rc4' into docs-next
I have a couple of fixes for warnings introduced after -rc1; catch up to
-rc4 so that the fixes have something to fix.
Diffstat (limited to 'lib/zstd/common/compiler.h')
| -rw-r--r-- | lib/zstd/common/compiler.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/zstd/common/compiler.h b/lib/zstd/common/compiler.h index a1a051e4bce6..f5a9c70a228a 100644 --- a/lib/zstd/common/compiler.h +++ b/lib/zstd/common/compiler.h @@ -16,6 +16,7 @@ *********************************************************/ /* force inlining */ +#if !defined(ZSTD_NO_INLINE) #if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ # define INLINE_KEYWORD inline #else @@ -24,6 +25,12 @@ #define FORCE_INLINE_ATTR __attribute__((always_inline)) +#else + +#define INLINE_KEYWORD +#define FORCE_INLINE_ATTR + +#endif /* On MSVC qsort requires that functions passed into it use the __cdecl calling conversion(CC). |