From: Date: September 14 2008 10:12pm
Subject: bzr commit into mysql-6.0-falcon branch (olav:2823) Bug#39181
List-Archive: http://lists.mysql.com/commits/54046
X-Bug: 39181
Message-Id: <20080914201247.29386.qmail@fimafeng08>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/os136802/mysql/develop/repo/falcon-bug39181/

 2823 Olav Sandstaa	2008-09-14
      Bug#39181 Build error in MemoryManager.h in Pushbuild on sol10-sparc-a-max
      
      Fixed compilation error that occured with Sun Studio 10 (Sun CC 5.7) due to
      inclusion of gcc specific code.
modified:
  storage/falcon/MemoryManager.h

=== modified file 'storage/falcon/MemoryManager.h'

=== modified file 'storage/falcon/MemoryManager.h'
--- a/storage/falcon/MemoryManager.h	2008-05-14 18:39:57 +0000
+++ b/storage/falcon/MemoryManager.h	2008-09-14 20:12:37 +0000
@@ -31,8 +31,10 @@
 
 #ifdef _WIN32
 #define ALWAYS_INLINE inline /* for windows */
-#else
+#elif __GNUC__
 #define ALWAYS_INLINE extern inline __attribute__ ((always_inline)) /* for gcc */
+#else
+#define ALWAYS_INLINE extern inline
 #endif
 
 class Stream;