diff options
| author | unknown <ramil@ram-book.(none)> | 2005-05-09 18:33:21 +0500 |
|---|---|---|
| committer | unknown <ramil@ram-book.(none)> | 2005-05-09 18:33:21 +0500 |
| commit | 09e426bf3cdde89b034546082748867c7825902a (patch) | |
| tree | e251840779bde10b346eb397fc1f42efcbb74862 /include | |
| parent | e514a1eea2b658602fb6784ee6a7ab8c13235a70 (diff) | |
| download | mariadb-git-09e426bf3cdde89b034546082748867c7825902a.tar.gz | |
a fix (bug #10438: Raid stopped working because of change in atomic add detection).
include/my_global.h:
a fix (bug #10438: Raid stopped working because of change in atomic add detection).
In order to compile with atomic.h on itanium we redefine 'new' because it's used
as a local variable in this file and conflicts with a kernel header.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index a9468f6561e..62c6a5d1e4a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -287,9 +287,15 @@ C_MODE_START int __cxa_pure_virtual() {\ #ifndef CONFIG_SMP #define CONFIG_SMP #endif +#if defined(__ia64__) +#define new my_arg_new +#endif C_MODE_START #include <asm/atomic.h> C_MODE_END +#if defined(__ia64__) +#undef new +#endif #endif #include <errno.h> /* Recommended by debian */ /* We need the following to go around a problem with openssl on solaris */ |