X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa6ca47e019fa71a563ab7bc6979838d1ddfdd2c..2b1d737b3e9413217302cde932cbc3af91d79024:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index a6a4a32d50..90812da1f1 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -917,6 +917,7 @@ static MemoryCriticalSection memLocker;
 
 #endif
 
+#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
 #ifdef __WXDEBUG__
 #if wxUSE_GLOBAL_MEMORY_OPERATORS
 void * operator new (size_t size, wxChar * fileName, int lineNum)
@@ -949,7 +950,9 @@ void operator delete[] (void * buf)
 {
   wxDebugFree(buf, true);
 }
-#endif
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
@@ -1061,7 +1064,6 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     free((char *)st);
 }
 
-#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
 #endif // __WXDEBUG__
 
 // Trace: send output to the current debugging stream