Merged fix of compiler issue

c4863932 · Mikael Ronstrom · 95fa4e2a · a897836f · c4863932
Commit c4863932 authored Oct 16, 2008 by Mikael Ronstrom
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/innobase/include/univ.i storage/innobase/include/univ.i +1 -1

No files found.
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -62,7 +62,7 @@ of the 32-bit x86 assembler in mutex operations. */
 /* We only try to do explicit inlining of functions with gcc and
 Sun Studio */

-# if !defined(__GNUC__) && !( defined(sun) || defined(__sun) )
+# if !defined(__GNUC__) && !defined(__SUNPRO_C)
 #  undef  UNIV_MUST_NOT_INLINE			/* Remove compiler warning */
 #  define UNIV_MUST_NOT_INLINE
 # endif