Skip to content

M
mariadb
Commit fd7a8d18 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

Fix compile error in UT_COMPILER_BARRIER on Visual Studio compiler.

parent 9794cf23
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 2 deletions
storage/innobase/include/ut0ut.h
View file @ fd7a8d18
...@@ -97,7 +97,13 @@ private: ...@@ -97,7 +97,13 @@ private:
# define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
# endif # endif
#define UT_COMPILER_BARRIER() __asm__ __volatile__ ("":::"memory") #if defined (__GNUC__)
# define UT_COMPILER_BARRIER() __asm__ __volatile__ ("":::"memory")
#elif defined (_MSC_VER)
# define UT_COMPILER_BARRIER() MemoryBarrier()
#else
# define UT_COMPILER_BARRIER()
#endif
# if defined(HAVE_HMT_PRIORITY_INSTRUCTION) # if defined(HAVE_HMT_PRIORITY_INSTRUCTION)
#include <sys/platform/ppc.h> #include <sys/platform/ppc.h>
......
storage/xtradb/include/ut0ut.h
View file @ fd7a8d18
...@@ -94,7 +94,13 @@ private: ...@@ -94,7 +94,13 @@ private:
# define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
# endif # endif
#define UT_COMPILER_BARRIER() __asm__ __volatile__ ("":::"memory") #if defined (__GNUC__)
# define UT_COMPILER_BARRIER() __asm__ __volatile__ ("":::"memory")
#elif defined (_MSC_VER)
# define UT_COMPILER_BARRIER() MemoryBarrier()
#else
# define UT_COMPILER_BARRIER()
#endif
# if defined(HAVE_HMT_PRIORITY_INSTRUCTION) # if defined(HAVE_HMT_PRIORITY_INSTRUCTION)
#include <sys/platform/ppc.h> #include <sys/platform/ppc.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7