diff options
| author | unknown <serg@serg.mylan> | 2005-05-24 21:02:42 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-24 21:02:42 +0200 |
| commit | d3f7ec30897868e6dbb724ff1c308b0fc7f5fe14 (patch) | |
| tree | 8112d302dc31fa8240718e6770e18a3079ad08af /include | |
| parent | edcc645b8e03bcd60012a871ead7175067b72c0a (diff) | |
| download | mariadb-git-d3f7ec30897868e6dbb724ff1c308b0fc7f5fe14.tar.gz | |
simplifying new/my_arg_new wrapping
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index f059d603976..d7cda085353 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -289,12 +289,14 @@ C_MODE_START int __cxa_pure_virtual() {\ #endif #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 -#if defined(__ia64__) +#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 */ |