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 /include/my_global.h | |
| parent | e29211c366253f8b0aac3c8d815c25c40103f5db (diff) | |
| parent | d5e8508f9030f444fce0d190d48480120ab904cd (diff) | |
| download | mariadb-git-6f6be1e77a68efff675c173fbc056b1311f09883.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
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, |