ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-31 15:38:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

lmdb: define MDB_INLINE macro instead of __inline.

Browse Source 
Change-Id: I3a2f47138a80b09f8c3682a9a26dbf5aca3445f7
This commit is contained in:
Leo Yuriev
2015-02-24 15:14:01 +03:00
parent 3766484c9e
commit 602fdd16b9
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mdb.c
View File

@@ -85,11 +85,12 @@
#endif #endif
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
/* LY: noting needed */ # define MDB_INLINE __inline
#elif defined(_MSC_VER) || defined(_WIN32) || defined(_WIN64) #elif defined(_MSC_VER) || defined(_WIN32) || defined(_WIN64)
# include <winnt.h> # include <winnt.h>
# include <intrin.h> # include <intrin.h>
# pragma intrinsic(_ReadWriteBarrier) # pragma intrinsic(_ReadWriteBarrier)
# define MDB_INLINE __inline
#elif defined(__INTEL_COMPILER) /* LY: Intel Compiler may mimic GCC and MSC */ #elif defined(__INTEL_COMPILER) /* LY: Intel Compiler may mimic GCC and MSC */
# include <intrin.h> # include <intrin.h>
# if defined(__ia64__) || defined(__ia64) || defined(_M_IA64) # if defined(__ia64__) || defined(__ia64) || defined(_M_IA64)
@@ -97,33 +98,34 @@
# elif defined(__i386__) || defined(__x86_64__) # elif defined(__i386__) || defined(__x86_64__)
# pragma intrinsic(_mm_mfence) # pragma intrinsic(_mm_mfence)
# endif # endif
# define MDB_INLINE __inline
#elif defined(__SUNPRO_C) || defined(__sun) || defined(sun) #elif defined(__SUNPRO_C) || defined(__sun) || defined(sun)
# include <mbarrier.h> # include <mbarrier.h>
# define __inline inline # define MDB_INLINE inline
#elif (defined(_HPUX_SOURCE) || defined(__hpux) || defined(__HP_aCC)) \ #elif (defined(_HPUX_SOURCE) || defined(__hpux) || defined(__HP_aCC)) \
&& (defined(HP_IA64) || defined(__ia64)) && (defined(HP_IA64) || defined(__ia64))
# include <machine/sys/inline.h> # include <machine/sys/inline.h>
# define __inline # define MDB_INLINE
#elif defined(__IBMC__) && defined(__powerpc) #elif defined(__IBMC__) && defined(__powerpc)
# include <atomic.h> # include <atomic.h>
# define __inline # define MDB_INLINE
#elif defined(_AIX) #elif defined(_AIX)
# include <builtins.h> # include <builtins.h>
# include <sys/atomic_op.h> # include <sys/atomic_op.h>
# define __inline # define MDB_INLINE
#elif (defined(__osf__) && defined(__DECC)) || defined(__alpha) #elif (defined(__osf__) && defined(__DECC)) || defined(__alpha)
# include <machine/builtins.h> # include <machine/builtins.h>
# include <c_asm.h> # include <c_asm.h>
# define __inline # define MDB_INLINE
#elif defined(__MWERKS__) #elif defined(__MWERKS__)
/* CodeWarrior - troubles ? */ /* CodeWarrior - troubles ? */
# pragma gcc_extensions # pragma gcc_extensions
# define __inline # define MDB_INLINE
#elif defined(__SNC__) #elif defined(__SNC__)
/* Sony PS3 - troubles ? */ /* Sony PS3 - troubles ? */
# define __inline # define MDB_INLINE
#else #else
# define __inline # define MDB_INLINE
#endif #endif
#if defined(__i386__) || defined(__x86_64__) \ #if defined(__i386__) || defined(__x86_64__) \
@@ -143,7 +145,7 @@
#define MDB_BARRIER_COMPILER 0 #define MDB_BARRIER_COMPILER 0
#define MDB_BARRIER_MEMORY 1 #define MDB_BARRIER_MEMORY 1
static __inline void mdb_barrier(int type) { static MDB_INLINE void mdb_barrier(int type) {
#if defined(__clang__) #if defined(__clang__)
__asm__ __volatile__ ("" ::: "memory"); __asm__ __volatile__ ("" ::: "memory");
if (type > MDB_BARRIER_COMPILER) if (type > MDB_BARRIER_COMPILER)
@@ -203,7 +205,7 @@ static __inline void mdb_barrier(int type) {
#define mdb_coherent_barrier() \ #define mdb_coherent_barrier() \
mdb_barrier(MDB_CACHE_IS_COHERENT ? MDB_BARRIER_COMPILER : MDB_BARRIER_MEMORY) mdb_barrier(MDB_CACHE_IS_COHERENT ? MDB_BARRIER_COMPILER : MDB_BARRIER_MEMORY)
static __inline void mdb_invalidate_cache(void *addr, int nbytes) { static MDB_INLINE void mdb_invalidate_cache(void *addr, int nbytes) {
mdb_coherent_barrier(); mdb_coherent_barrier();
#if defined(__mips) && defined(__linux) #if defined(__mips) && defined(__linux)
/* MIPS has cache coherency issues. /* MIPS has cache coherency issues.