Skip to content

M
mariadb
Commit 2090d651 authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files
Options

univ.i Do not inline on Unix if non-gcc compiler

parent dc618189
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
innobase/include/univ.i
View file @ 2090d651
...@@ -9,7 +9,6 @@ Created 1/20/1994 Heikki Tuuri ...@@ -9,7 +9,6 @@ Created 1/20/1994 Heikki Tuuri
#ifndef univ_i #ifndef univ_i
#define univ_i #define univ_i
#if (defined(_WIN32) || defined(_WIN64)) #if (defined(_WIN32) || defined(_WIN64))
#define __WIN__ #define __WIN__
#include <windows.h> #include <windows.h>
...@@ -28,6 +27,11 @@ be defined: ...@@ -28,6 +27,11 @@ be defined:
#else #else
/* The Unix version */ /* The Unix version */
/* Most C compilers other than gcc do not know 'extern inline' */
#ifndef __GNUC__
#define UNIV_MUST_NOT_INLINE
#endif
/* Include two header files from MySQL to make the Unix flavor used /* Include two header files from MySQL to make the Unix flavor used
in compiling more Posix-compatible. We assume that 'innobase' is a in compiling more Posix-compatible. We assume that 'innobase' is a
subdirectory of 'mysql'. */ subdirectory of 'mysql'. */
...@@ -37,7 +41,6 @@ subdirectory of 'mysql'. */ ...@@ -37,7 +41,6 @@ subdirectory of 'mysql'. */
/* Include <sys/stat.h> to get S_I... macros defined for os0file.c */ /* Include <sys/stat.h> to get S_I... macros defined for os0file.c */
#include <sys/stat.h> #include <sys/stat.h>
#undef PACKAGE #undef PACKAGE
#undef VERSION #undef VERSION
......
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