diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 6 | ||||
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index f4798680d3..41dc4468a6 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -81,10 +81,6 @@ typedef wchar_t FX_WCHAR; // Keep, maybe bad platform wchars. // TODO(palmer): it should be a |size_t|, or at least unsigned. typedef int FX_STRSIZE; -#if defined(DEBUG) && !defined(_DEBUG) -#define _DEBUG -#endif - #ifndef TRUE #define TRUE 1 #endif @@ -104,7 +100,7 @@ static_assert(FALSE == false, "false_needs_to_be_false"); #define FXSYS_assert assert #ifndef ASSERT -#ifdef _DEBUG +#ifndef NDEBUG #define ASSERT FXSYS_assert #else #define ASSERT(a) diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 136edd073a..396dbc4fff 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -15,7 +15,7 @@ namespace { -#if defined(_DEBUG) +#ifndef NDEBUG bool IsValidCodePage(FX_WORD codepage) { switch (codepage) { case 0: |