diff --git a/include/my_compiler.h b/include/my_compiler.h index 0a83c6587a5f6b869deecfb67e37d8e0d8dca378..1cd46ff4260fda750645eeb1e6abf14ad87d2145 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 82a20053bfcdd7a65fe9291235a0b3649bd2c56e..2424fd6bfc96ca032f887c60f6e42b8b933bc7ec 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,