Skip to content

M
mariadb
Commit c5960a98 authored by iggy/Administrator@amd64's avatar iggy/Administrator@amd64
Browse files
Options

Post Merge Cleanup

parent 394ad975
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
storage/innobase/include/univ.i
View file @ c5960a98
...@@ -40,12 +40,21 @@ if we are compiling on Windows. */ ...@@ -40,12 +40,21 @@ if we are compiling on Windows. */
# undef VERSION # undef VERSION
/* Include the header file generated by GNU autoconf */ /* Include the header file generated by GNU autoconf */
#ifndef __WIN__
# include "config.h" # include "config.h"
#endif
# ifdef HAVE_SCHED_H # ifdef HAVE_SCHED_H
# include <sched.h> # include <sched.h>
# endif # endif
/* When compiling for Itanium IA64, undefine the flag below to prevent use
of the 32-bit x86 assembler in mutex operations. */
#if defined(__WIN__) && !defined(WIN64) && !defined(_WIN64)
#define UNIV_CAN_USE_X86_ASSEMBLER
#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++ */ Microsoft Visual C++ */
......
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