summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-10-30 16:31:35 +0200
committerunknown <monty@hundin.mysql.fi>2001-10-30 16:31:35 +0200
commit7b1cfb6353ee805326a22d8c9e71953b7ea8ed54 (patch)
treeae7c97d916cbedaec41df19869889814ef8f8688 /innobase
parent859371bb5ffaf635d18552081a85c975278ab8e7 (diff)
downloadmariadb-git-7b1cfb6353ee805326a22d8c9e71953b7ea8ed54.tar.gz
Fix for gcc 3.0
Fix for using quoted table names with the SJIS character set. BUILD/FINISH.sh: Fix for gcc 3.0 BUILD/SETUP.sh: Fix for gcc 3.0 Docs/manual.texi: Changelog innobase/include/univ.i: Fix for gcc 3.0 sql/sql_lex.cc: Fix for using quoted table names with the SJIS character set.
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/univ.i6
1 files changed, 5 insertions, 1 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i
index 9fc9f85f633..a4345babbbe 100644
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@@ -104,8 +104,12 @@ memory is read outside the allocated blocks. */
#define UNIV_INLINE __inline
#else
/* config.h contains the right def for 'inline' for the current compiler */
+#if (__GNUC__ == 2)
#define UNIV_INLINE extern inline
-
+#else
+/* extern inline doesn't work with gcc 3.0.2 */
+#define UNIV_INLINE static inline
+#endif
#endif
#else