diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-23 18:49:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-23 18:49:21 +0300 |
| commit | 1dd2f90faf79eb1b194c9af0cde987c8a7b3058f (patch) | |
| tree | df9457baf92d1aba63e31cc13fdfe0cc6b6e4be6 /include/my_atomic.h | |
| parent | fcc9c8627a54f68ffe7c2f225d20a9f8c1016a08 (diff) | |
| parent | 0a8a9a3fc083fbaf44ce2b59d4995af9950f11b4 (diff) | |
| download | mariadb-git-1dd2f90faf79eb1b194c9af0cde987c8a7b3058f.tar.gz | |
Auto-merge from mysql-next-mr-bugfixing.
Diffstat (limited to 'include/my_atomic.h')
| -rw-r--r-- | include/my_atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h index e2304e3246d..8ba3e201730 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -105,7 +105,7 @@ warning: 'transparent_union' attribute ignored */ #if defined(__GNUC__) && !defined(__cplusplus) && \ - ! (defined(__APPLE__) && defined(_ARCH_PPC64)) + ! (defined(__APPLE__) && (defined(_ARCH_PPC64) ||defined (_ARCH_PPC))) /* we want to be able to use my_atomic_xxx functions with both signed and unsigned integers. But gcc will issue a warning |