X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..aa33452c949f27fb1f7b7bcdc26d82ceb6aa453a:/src/common/memory.cpp diff --git a/src/common/memory.cpp b/src/common/memory.cpp index d8ad194662..d7d6c07461 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -35,7 +35,7 @@ #include "wx/app.h" #endif -#include +#include "wx/log.h" #include #include "wx/ioswrap.h" @@ -988,6 +988,7 @@ void * operator new[] (size_t size, wxChar * fileName, int lineNum) } #endif +#if !defined(__VISAGECPP__) // already defines this by default void operator delete (void * buf) { #ifdef NO_DEBUG_ALLOCATION @@ -996,6 +997,7 @@ void operator delete (void * buf) wxDebugFree(buf); #endif } +#endif // VC++ 6.0 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)