diff options
| author | unknown <serg@serg.mylan> | 2005-06-03 15:05:18 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-03 15:05:18 +0200 |
| commit | 78fc41727e17807668ab87c41060abf59a6cc2ee (patch) | |
| tree | 5e3d4b3ac07da06636b76695a0adca3603656228 /include | |
| parent | dae940d11e2c890d12352e861b45593dbebe36d6 (diff) | |
| download | mariadb-git-78fc41727e17807668ab87c41060abf59a6cc2ee.tar.gz | |
*don't* mess with kernel defines, boy.
and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/include/my_global.h b/include/my_global.h index 0d6f52a3376..f24bcd528ca 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -203,18 +203,6 @@ C_MODE_END #define BAD_MEMCPY #endif -/* In Linux-alpha we have atomic.h if we are using gcc */ -#if defined(HAVE_LINUXTHREADS) && 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(HAVE_LINUXTHREADS) && 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 @@ -276,16 +264,17 @@ C_MODE_END #include <alloca.h> #endif #ifdef HAVE_ATOMIC_ADD -#define __SMP__ -#ifdef HAVE_LINUX_CONFIG_H -#include <linux/config.h> /* May define CONFIG_SMP */ -#endif -#ifndef CONFIG_SMP -#define CONFIG_SMP +#if defined(__ia64__) +#define new my_arg_new +#define need_to_restore_new 1 #endif C_MODE_START #include <asm/atomic.h> C_MODE_END +#ifdef need_to_restore_new /* probably safer than #ifdef new */ +#undef new +#undef need_to_restore_new +#endif #endif #include <errno.h> /* Recommended by debian */ /* We need the following to go around a problem with openssl on solaris */ |