diff options
Diffstat (limited to 'innobase/include/univ.i')
| -rw-r--r-- | innobase/include/univ.i | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 5e74b7eb09b..fa5a8aef389 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -9,7 +9,7 @@ Created 1/20/1994 Heikki Tuuri #ifndef univ_i #define univ_i -#if (defined(_WIN32) || defined(_WIN64)) +#if (defined(_WIN32) || defined(_WIN64)) && !defined(MYSQL_SERVER) #define __WIN__ #include <windows.h> @@ -20,18 +20,28 @@ be defined: #define CRITICAL_SECTION ulint */ +#ifdef _NT_ +#define __NT__ +#endif + #else /* The Unix version */ +/* Most C compilers other than gcc do not know 'extern inline' */ +#if !defined(__GNUC__) && !defined(__WIN__) +#define UNIV_MUST_NOT_INLINE +#endif + /* Include two header files from MySQL to make the Unix flavor used in compiling more Posix-compatible. We assume that 'innobase' is a subdirectory of 'mysql'. */ #include <global.h> #include <my_pthread.h> +#ifndef __WIN__ /* Include <sys/stat.h> to get S_I... macros defined for os0file.c */ #include <sys/stat.h> - +#endif #undef PACKAGE #undef VERSION |