diff options
| author | unknown <ramil@mysql.com> | 2005-05-06 18:41:42 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-05-06 18:41:42 +0500 |
| commit | d1b7eda58124fd61d71fdbc8359648e52a8161d1 (patch) | |
| tree | e7785cd972aa47138ff0ab9111562e0350055a14 /include | |
| parent | cdbf4939975a579179c3cdeb744416841d5416af (diff) | |
| parent | f547b03edbb3a078c9917184b7469cc324f99bfb (diff) | |
| download | mariadb-git-d1b7eda58124fd61d71fdbc8359648e52a8161d1.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/my_global.h b/include/my_global.h index bf6f3b52c4b..017cdea140a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -214,18 +214,6 @@ C_MODE_START int __cxa_pure_virtual() {\ #define BAD_MEMCPY #endif -/* In Linux-alpha we have atomic.h if we are using gcc */ -#if defined(TARGET_OS_LINUX) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD) -#define HAVE_ATOMIC_ADD -#define HAVE_ATOMIC_SUB -#endif - -/* In Linux-ia64 including atomic.h will give us an error */ -#if (defined(TARGET_OS_LINUX) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD) -#undef HAVE_ATOMIC_ADD -#undef HAVE_ATOMIC_SUB -#endif - #if defined(_lint) && !defined(lint) #define lint #endif |