mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
This commit is contained in:
parent
5237de7a71
commit
66330a9d59
1 changed files with 0 additions and 2 deletions
|
@ -274,10 +274,8 @@ C_MODE_START int __cxa_pure_virtual() {\
|
||||||
#include <alloca.h>
|
#include <alloca.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ATOMIC_ADD
|
#ifdef HAVE_ATOMIC_ADD
|
||||||
#if defined(__ia64__)
|
|
||||||
#define new my_arg_new
|
#define new my_arg_new
|
||||||
#define need_to_restore_new 1
|
#define need_to_restore_new 1
|
||||||
#endif
|
|
||||||
C_MODE_START
|
C_MODE_START
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
C_MODE_END
|
C_MODE_END
|
||||||
|
|
Loading…
Reference in a new issue