added some utils (tex2rtf, helpgen, makegen) to make system

[wxWidgets.git] / src / common / memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index d8ad194662daaa6e3d84e76511e39df0035f7b5a..d30fc10ee8b8e9b54e5539fbffc0d65fb48c78d0 100644 (file)
--- 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,13 +998,12 @@ void operator delete (void * buf)
   wxDebugFree(buf);
 #endif
 }
+#endif
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
-// ::operator delete(pData);
-  // JACS 21/11/1998: surely we need to call wxDebugFree?
   wxDebugFree(pData, FALSE);
 }
 // New operator 21/11/1998