lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

fixed MEM_STATIC already defined in Linux Kernel mode

Browse Source
This commit is contained in:
Yann Collet
2023-06-14 20:03:39 -07:00
parent 74c901bbed
commit d9645327b3
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/linux-kernel/mem.h
View File

@ -24,6 +24,7 @@
/*-**************************************** /*-****************************************
* Compiler specifics * Compiler specifics
******************************************/ ******************************************/
#undef MEM_STATIC /* may be already defined from common/compiler.h */
#define MEM_STATIC static inline #define MEM_STATIC static inline
/*-************************************************************** /*-**************************************************************

2
lib/common/allocations.h
View File

@ -14,7 +14,7 @@
#define ZSTD_DEPS_NEED_MALLOC #define ZSTD_DEPS_NEED_MALLOC
#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ #include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */
#include "mem.h" /* MEM_STATIC */ #include "compiler.h" /* MEM_STATIC */
#define ZSTD_STATIC_LINKING_ONLY #define ZSTD_STATIC_LINKING_ONLY
#include "../zstd.h" /* ZSTD_customMem */ #include "../zstd.h" /* ZSTD_customMem */

2
lib/common/compiler.h
View File

@ -90,6 +90,7 @@
* Updating the prefix is probably preferable, but requires a fairly large codemod, * Updating the prefix is probably preferable, but requires a fairly large codemod,
* since this name is used everywhere. * since this name is used everywhere.
*/ */
#ifndef MEM_STATIC /* already defined in Linux Kernel mem.h */
#if defined(__GNUC__) #if defined(__GNUC__)
# define MEM_STATIC static __inline UNUSED_ATTR # define MEM_STATIC static __inline UNUSED_ATTR
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) #elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
@ -99,6 +100,7 @@
#else #else
# define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */ # define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */
#endif #endif
#endif
/* force no inlining */ /* force no inlining */
#ifdef _MSC_VER #ifdef _MSC_VER