diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 16:12:31 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 16:12:31 +0100 |
| commit | de4fb176622d54a82ea3ceb7362392aaf5ff0b5a (patch) | |
| tree | 8b510763d14d89b97cd719e79834c84e095932d7 /lib/zstd/common/compiler.h | |
| parent | 9be4c88bb7924f68f88cfd47d925c2d046f51a73 (diff) | |
| parent | 9c6d6652e950fb34295f446676a811f6df5b8561 (diff) | |
Merge branches 'fixes' and 'misc' into for-linus
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). |