diff --git a/include/my_global.h b/include/my_global.h index b6c6ff13405..9bf411f5c82 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1489,11 +1489,24 @@ do { doubleget_union _tmp; \ #define dlerror() "" #endif +#ifndef __NETWARE__ /* - Include standard definitions of operator new and delete. + * Include standard definitions of operator new and delete. */ #ifdef __cplusplus #include #endif +#else +/* + * Define placement versions of operator new and operator delete since + * we don't have when building for Netware. + */ +#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 */ } +#endif +#endif #endif /* my_global_h */