diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 16:39:40 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 16:39:40 -0300 |
| commit | d7944b621e895383482792df3b8aa3eed6ee5f6d (patch) | |
| tree | 05485c186839ac3c248a3e0355728341d0f397d4 /include | |
| parent | f317d3a6fb413cfc04c1ed005df8e859664e41d5 (diff) | |
| download | mariadb-git-d7944b621e895383482792df3b8aa3eed6ee5f6d.tar.gz | |
Bug#42733: Type-punning warnings when compiling MySQL --
strict aliasing violations.
Post-merge fix: include my_compiler.h before my_attribute.h
as the latter will undef __attribute__ if the compiler is not
GCC. Based on the compiler version, in my_compiler.h we know
for sure whether the aligned attribute is supported. Furthermore,
undefining attribute might cause bugs if some system header
uses it.
include/my_compiler.h:
Drop aligned attribute support from Sun Studio C++ compiler
as its not clear exactly which version of it supports the
attribute.
Diffstat (limited to 'include')
| -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 6723267ae50..ec22a57329b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -623,7 +623,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, |