Skip to content

M
mariadb
Commit 4290e7c7 authored by serg@serg.mylan's avatar serg@serg.mylan
Browse files
Options

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 46a3eef6 e2c8f63e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
include/my_global.h
View file @ 4290e7c7
...@@ -289,12 +289,14 @@ C_MODE_START int __cxa_pure_virtual() {\ ...@@ -289,12 +289,14 @@ C_MODE_START int __cxa_pure_virtual() {\
#endif #endif
#if defined(__ia64__) #if defined(__ia64__)
#define new my_arg_new #define new my_arg_new
#define need_to_restore_new 1
#endif #endif
C_MODE_START C_MODE_START
#include <asm/atomic.h> #include <asm/atomic.h>
C_MODE_END C_MODE_END
#if defined(__ia64__) #ifdef need_to_restore_new /* probably safer than #ifdef new */
#undef new #undef new
#undef need_to_restore_new
#endif #endif
#endif #endif
#include <errno.h> /* Recommended by debian */ #include <errno.h> /* Recommended by debian */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7