mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
This commit is contained in:
commit
6f6be1e77a
2 changed files with 4 additions and 2 deletions
include
|
@ -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 */
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Add table
Reference in a new issue