X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70bf61807aebdb7f4c36d64f2a4cbbbc0ee1bc8a..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/msw/msvcrt.h?ds=sidebyside diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h index c5afed22c7..692f19ef35 100644 --- a/include/wx/msw/msvcrt.h +++ b/include/wx/msw/msvcrt.h @@ -5,7 +5,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 31.01.1999 -// RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,7 +13,8 @@ // used like this: // wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); // to turn on memory leak checks for programs compiled with Microsoft Visual -// C++ (5.0+). The macro will expand to nothing under other compilers. +// C++ (5.0+). The macro will not be defined under other compilers or if it +// can't be used with MSVC for whatever reason. #ifndef _MSW_MSVCRT_H_ #define _MSW_MSVCRT_H_ @@ -22,7 +22,7 @@ // use debug CRT functions for memory leak detections in VC++ 5.0+ in debug // builds #undef wxUSE_VC_CRTDBG -#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ >= 1000) \ +#if defined(_DEBUG) && defined(__VISUALC__) && (__VISUALC__ >= 1000) \ && !defined(UNDER_CE) // it doesn't combine well with wxWin own memory debugging methods #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__) @@ -31,11 +31,6 @@ #endif #ifdef wxUSE_VC_CRTDBG - // VC++ uses this macro as debug/release mode indicator - #ifndef _DEBUG - #define _DEBUG - #endif - // Need to undef new if including crtdbg.h which may redefine new itself #ifdef new #undef new @@ -43,7 +38,7 @@ #include #ifndef _CRTBLD - // Need when builded with pure MS SDK + // Needed when building with pure MS SDK #define _CRTBLD #endif @@ -54,7 +49,7 @@ // this define works around a bug with inline declarations of new, see // - // http://support.microsoft.com/support/kb/articles/Q140/8/58.asp + // http://support.microsoft.com/kb/q140858/ // // for the details #define new WXDEBUG_NEW