Commit d839f3a9 authored by unknown's avatar unknown
Browse files

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 5e5eb0a6 d3f7ec30

include/my_global.h

+3 −1
Original line number Diff line number Diff line
@@ -289,12 +289,14 @@ C_MODE_START int __cxa_pure_virtual() {\ 
#endif

#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

#if defined(__ia64__)

#ifdef need_to_restore_new /* probably safer than #ifdef new */

#undef new

#undef need_to_restore_new

#endif

#endif

#include <errno.h>				/* Recommended by debian */