diff options
| author | unknown <heikki@donna.mysql.fi> | 2001-05-03 15:22:43 +0300 |
|---|---|---|
| committer | unknown <heikki@donna.mysql.fi> | 2001-05-03 15:22:43 +0300 |
| commit | eef01ff262825f636fc0d8d6cbfdf503f909ab9c (patch) | |
| tree | 1482195e9efa0137fbfa700624629e2e863d5023 /innobase | |
| parent | 1a40dcc8bbe052f3e96a1943cbc3470d0cce2525 (diff) | |
| download | mariadb-git-eef01ff262825f636fc0d8d6cbfdf503f909ab9c.tar.gz | |
univ.i Do not inline on Unix if non-gcc compiler
innobase/include/univ.i:
Do not inline on Unix if non-gcc compiler
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/univ.i | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 46ba508f784..253ef08c9f8 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -9,7 +9,6 @@ Created 1/20/1994 Heikki Tuuri #ifndef univ_i #define univ_i - #if (defined(_WIN32) || defined(_WIN64)) #define __WIN__ #include <windows.h> @@ -28,6 +27,11 @@ be defined: #else /* 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 in compiling more Posix-compatible. We assume that 'innobase' is a 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> - #undef PACKAGE #undef VERSION |