diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-16 20:38:30 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-16 20:38:30 +0200 |
| commit | 237315c076c1813e497918fbc1115426edc4e60d (patch) | |
| tree | 8c8a9929b2bebab8306087cf5314b5524d74340d /include | |
| parent | be71f3ccb61d3c4f1ebc096ba4e5e1563f578681 (diff) | |
| parent | 79e40ef6e45768a6fe0b9f4e5223b5a7fe684ca5 (diff) | |
| download | mariadb-git-237315c076c1813e497918fbc1115426edc4e60d.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.new
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_atomic.h | 11 | ||||
| -rw-r--r-- | include/my_global.h | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h index 5fe7e521c19..59297750cb7 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -66,7 +66,16 @@ v=tmp; #endif -#ifdef __GNUC__ +/* + transparent_union doesn't work in g++ + Bug ? + + Darwin's gcc doesn't want to put pointers in a transparent_union + when built with -arch ppc64. Complains: + warning: 'transparent_union' attribute ignored +*/ +#if defined(__GNUC__) && !defined(__cplusplus) && \ + ! (defined(__APPLE__) && defined(_ARCH_PPC64)) /* we want to be able to use my_atomic_xxx functions with both signed and unsigned integers. But gcc will issue a warning diff --git a/include/my_global.h b/include/my_global.h index fe8e11abfd5..1287ae3ac2a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -431,6 +431,9 @@ C_MODE_END #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif #ifdef HAVE_SYS_TIMEB_H #include <sys/timeb.h> /* Avoid warnings on SCO */ #endif |