From 66330a9d59d57c1454a8361cb01df3f88ed6d5e8 Mon Sep 17 00:00:00 2001 From: "ramil@mysql.com" <> Date: Fri, 24 Jun 2005 12:51:11 +0500 Subject: [PATCH] an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h). --- include/my_global.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index f8ba555b150..9b53be66db0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -274,10 +274,8 @@ C_MODE_START int __cxa_pure_virtual() {\ #include #endif #ifdef HAVE_ATOMIC_ADD -#if defined(__ia64__) #define new my_arg_new #define need_to_restore_new 1 -#endif C_MODE_START #include C_MODE_END