Merge of mysql-5.1-bugteam into mysql-trunk-merge.

6f6be1e7 · Davi Arnaut · e29211c3 · d5e8508f · 6f6be1e7 · 6f6be1e7
Commit 6f6be1e7 authored Jul 14, 2010 by Davi Arnaut
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

include/my_compiler.h include/my_compiler.h +3 -1

include/my_global.h include/my_global.h +1 -1

No files found.
--- a/include/my_compiler.h
+++ b/include/my_compiler.h
@@ -42,7 +42,7 @@

 /* Oracle Solaris Studio */
 #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# if (__SUNPRO_C >= 0x590) || (__SUNPRO_CC >= 0x590)
+# if __SUNPRO_C >= 0x590
 #   define MY_ALIGN_EXT
 # endif

@@ -124,4 +124,6 @@ struct my_aligned_storage

 #endif /* __cplusplus */

+#include <my_attribute.h>
+
 #endif /* MY_COMPILER_INCLUDED */
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -698,7 +698,7 @@ typedef unsigned short ushort;
 #define my_const_cast(A) (A)
 #endif

-#include <my_attribute.h>
+#include <my_compiler.h>

 /*
  Wen using the embedded library, users might run into link problems,