X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..270a909e20a2c652fd816ad14407113ad0319c9d:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index d8ad194662..a50a601380 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -35,7 +35,7 @@
 #include "wx/app.h"
 #endif
 
-#include <wx/log.h>
+#include "wx/log.h"
 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
@@ -46,7 +46,8 @@
     #include <fstream>
 #endif
 
-#if !defined(__WATCOMC__) && !defined(__VMS__) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
+     && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 #include <memory.h>
 #endif
 
@@ -988,6 +989,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 +998,7 @@ void operator delete (void * buf)
   wxDebugFree(buf);
 #endif
 }
+#endif
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)