Commit 77dc5c42 authored by unknown's avatar unknown

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.
parent 22882964
...@@ -274,10 +274,8 @@ C_MODE_START int __cxa_pure_virtual() {\ ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment