diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 16:42:35 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 16:42:35 -0300 |
| commit | 6f6be1e77a68efff675c173fbc056b1311f09883 (patch) | |
| tree | 7559f250e79556ebbf0c00fabaa6c3d5c277200a | |
| parent | e29211c366253f8b0aac3c8d815c25c40103f5db (diff) | |
| parent | d5e8508f9030f444fce0d190d48480120ab904cd (diff) | |
| download | mariadb-git-6f6be1e77a68efff675c173fbc056b1311f09883.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
| -rw-r--r-- | include/my_compiler.h | 4 | ||||
| -rw-r--r-- | include/my_global.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/my_compiler.h b/include/my_compiler.h index 0a83c6587a5..1cd46ff4260 100644 --- 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 */ diff --git a/include/my_global.h b/include/my_global.h index 82a20053bfc..2424fd6bfc9 100644 --- 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, |