test for timegm() added

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index d8ad194662daaa6e3d84e76511e39df0035f7b5a..a50a6013807dab5be9ca8c8e3b0820893507872d 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -35,7 +35,7 @@
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"
 #endif
 

-#include <wx/log.h>
+#include "wx/log.h"

 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
 #include <stdlib.h>
 
 #include "wx/ioswrap.h"


@@ -46,7 +46,8 @@
     #include <fstream>
 #endif
 
     #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
 
 #include <memory.h>
 #endif
 


@@ -988,6 +989,7 @@ void * operator new[] (size_t size, wxChar * fileName, int lineNum)
 }
 #endif
 
 }
 #endif
 

+#if !defined(__VISAGECPP__) // already defines this by default

 void operator delete (void * buf)
 {
 #ifdef NO_DEBUG_ALLOCATION
 void operator delete (void * buf)
 {
 #ifdef NO_DEBUG_ALLOCATION


@@ -996,6 +998,7 @@ void operator delete (void * buf)
   wxDebugFree(buf);
 #endif
 }
   wxDebugFree(buf);
 #endif
 }

+#endif

 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)