Commit c13e1694 authored by unknown's avatar unknown

Changes to fix building on Windows.


include/my_global.h:
  Using Standard C++ header file <new> instead of defining all the versions
  of operator new and operator delete ourself.
parent 67d0f8cf
...@@ -1479,14 +1479,10 @@ do { doubleget_union _tmp; \ ...@@ -1479,14 +1479,10 @@ do { doubleget_union _tmp; \
#endif #endif
/* /*
Define placement versions of operator new and operator delete since Include standard definitions of operator new and delete.
we cannot be sure that the <new> include exists.
*/ */
#ifdef __cplusplus #ifdef __cplusplus
inline void *operator new(size_t, void *ptr) { return ptr; } #include <new>
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 */ #endif /* my_global_h */
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