corrected #ifdef order (might help linking with wxUSE_MEMORY_TRACING==1)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index e3fd5b0551f0acc40eacec4243544625c09ce85a..1a6fae329d6a5d0bf93258139d55457b2f399944 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -907,10 +907,11 @@ private:
 
 static MemoryCriticalSection memLocker;
 
 
 static MemoryCriticalSection memLocker;
 

-#endif
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+

 
 

-#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

+#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 #if wxUSE_GLOBAL_MEMORY_OPERATORS
 void * operator new (size_t size, wxChar * fileName, int lineNum)
 {
 #if wxUSE_GLOBAL_MEMORY_OPERATORS
 void * operator new (size_t size, wxChar * fileName, int lineNum)
 {


@@ -943,8 +944,8 @@ void operator delete[] (void * buf)
   wxDebugFree(buf, true);
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
   wxDebugFree(buf, true);
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS

-#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS
 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS

+#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )