Commit 77dc5c42 authored by unknown's avatar unknown
Browse files

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

include/my_global.h

+0 −2
Original line number Diff line number Diff line
@@ -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