Skip to content

M
mariadb
Commit 88640e37 authored by Mikael Ronstrom's avatar Mikael Ronstrom
Browse files
Options

Merge in inline patch

parents 9daa56fd 3c24289f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/innobase/include/univ.i
View file @ 88640e37
...@@ -56,9 +56,9 @@ of the 32-bit x86 assembler in mutex operations. */ ...@@ -56,9 +56,9 @@ of the 32-bit x86 assembler in mutex operations. */
# endif # endif
/* We only try to do explicit inlining of functions with gcc and /* We only try to do explicit inlining of functions with gcc and
Microsoft Visual C++ */ Sun Studio */
# if !defined(__GNUC__) # if !defined(__GNUC__) && !( defined(sun) || defined(__sun) )
# undef UNIV_MUST_NOT_INLINE /* Remove compiler warning */ # undef UNIV_MUST_NOT_INLINE /* Remove compiler warning */
# define UNIV_MUST_NOT_INLINE # define UNIV_MUST_NOT_INLINE
# endif # endif
......
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