diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-02-22 16:47:19 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-02-22 16:47:19 -0800 |
| commit | e4ac3369dc7bb1d0ae913404f008aea1fcd92480 (patch) | |
| tree | 29d21185232c7eaedeacdcafc23080b2152684d5 | |
| parent | bd7820c536908801e49ea83a6ca73279cc07f5cd (diff) | |
| download | pdfium-e4ac3369dc7bb1d0ae913404f008aea1fcd92480.tar.xz | |
Switch from _DEBUG to NDEBUG.
- NDEBUG is more widely used in Chromium
- _DEBUG is not defined on Mac in Chromium
- Leaving _DEBUG in for standalone debug builds for the benefit of
third party libraries / Windows.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1721073004 .
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 6 | ||||
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/global.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp | 6 |
4 files changed, 6 insertions, 10 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: diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index 32995ffbb1..e464339176 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -57,7 +57,7 @@ static unsigned JS_CalcHash(const wchar_t* main) { return (unsigned)FX_HashCode_String_GetW(main, FXSYS_wcslen(main)); } -#ifdef _DEBUG +#ifndef NDEBUG class HashVerify { public: HashVerify(); diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp index 4b6fc0ccbe..0ad73c1777 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp @@ -3277,7 +3277,7 @@ void CXFA_FM2JSContext::Ref(FXJSE_HOBJECT hThis, FXJSE_Value_Release(rgValues[i]); } } else if (FXJSE_Value_IsArray(argOne)) { -#if defined(_DEBUG) +#ifndef NDEBUG FXJSE_HVALUE lengthValue = FXJSE_Value_Create(hruntime); FXJSE_Value_GetObjectProp(argOne, "length", lengthValue); FXSYS_assert(FXJSE_Value_ToInteger(lengthValue) >= 3); @@ -6458,7 +6458,7 @@ void CXFA_FM2JSContext::get_fm_jsobj(FXJSE_HOBJECT hThis, if (argc == 1) { FXJSE_HVALUE argOne = args.GetValue(0); if (FXJSE_Value_IsArray(argOne)) { -#if defined(_DEBUG) +#ifndef NDEBUG FXJSE_HRUNTIME hruntime = pContext->GetScriptRuntime(); FXJSE_HVALUE lengthValue = FXJSE_Value_Create(hruntime); FXJSE_Value_GetObjectProp(argOne, "length", lengthValue); @@ -6484,7 +6484,7 @@ void CXFA_FM2JSContext::fm_var_filter(FXJSE_HOBJECT hThis, if (argc == 1) { FXJSE_HVALUE argOne = args.GetValue(0); if (FXJSE_Value_IsArray(argOne)) { -#if defined(_DEBUG) +#ifndef NDEBUG FXJSE_HVALUE lengthValue = FXJSE_Value_Create(hruntime); FXJSE_Value_GetObjectProp(argOne, "length", lengthValue); FXSYS_assert(FXJSE_Value_ToInteger(lengthValue) >= 3); |