From 0a2e305c022b0752ab9e4b7685c79fa7aa42b7d9 Mon Sep 17 00:00:00 2001 From: "mats@romeo.(none)" <> Date: Sat, 24 Feb 2007 17:33:58 +0100 Subject: [PATCH] Changes to fix building on Windows. --- include/my_global.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index d92e5f07948..acf19fef8c0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1479,14 +1479,10 @@ do { doubleget_union _tmp; \ #endif /* - Define placement versions of operator new and operator delete since - we cannot be sure that the include exists. + Include standard definitions of operator new and delete. */ #ifdef __cplusplus -inline void *operator new(size_t, void *ptr) { return ptr; } -inline void *operator new[](size_t, void *ptr) { return ptr; } -inline void operator delete(void*, void*) { /* Do nothing */ } -inline void operator delete[](void*, void*) { /* Do nothing */ } +#include #endif #endif /* my_global_h */