diff options
| author | unknown <ramil@mysql.com> | 2005-06-24 12:51:11 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-06-24 12:51:11 +0500 |
| commit | 77dc5c423fb9f22dfc931d1fd1a00715c1fca0e2 (patch) | |
| tree | 54233c4912f69512bbebaa367f90da2629dec024 | |
| parent | 22882964835c212046bdebaa7fed9d9bf1f97ad3 (diff) | |
| download | mariadb-git-77dc5c423fb9f22dfc931d1fd1a00715c1fca0e2.tar.gz | |
an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
include/my_global.h:
an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
redefine 'new' before #include <asm/atomic.h> in any case.
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 0 insertions, 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 <alloca.h> #endif #ifdef HAVE_ATOMIC_ADD -#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 |