Fix build issue on 32-bit Solaris using gcc

2c82616b · Mikael Ronstrom · 440c2f43 · 2c82616b
Commit 2c82616b authored Feb 20, 2009 by Mikael Ronstrom
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

storage/innobase/include/univ.i storage/innobase/include/univ.i +7 -0

No files found.
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -67,6 +67,13 @@ of the 32-bit x86 assembler in mutex operations. */
 #  define UNIV_MUST_NOT_INLINE
 # endif

+/* When on Solaris, gcc, and 32-bit disable inlining */
+
+# if defined(__GNUC__) && defined(UNIV_SOLARIS) && !defined(__x86_64__)
+#  undef  UNIV_MUST_NOT_INLINE
+#  define UNIV_MUST_NOT_INLINE
+# endif
+
 # ifdef HAVE_PREAD
 #  define HAVE_PWRITE
 # endif