diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
| commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
| tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /core/src/fxcrt/fx_basic_wstring.cpp | |
| parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
| download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz | |
Merge to XFA: Use stdint.h types throughout PDFium.
Near-automatic merge, plus re-running scripts to update
additional usage.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1172793002
Diffstat (limited to 'core/src/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 09e64e0c72..aeb366338e 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -33,7 +33,7 @@ CFX_WideString::StringData* CFX_WideString::StringData::Create(int nLen) int usableLen = (totalSize - overhead) / sizeof(FX_WCHAR); FXSYS_assert(usableLen >= nLen); - void* pData = FX_Alloc(FX_BYTE, iSize.ValueOrDie()); + void* pData = FX_Alloc(uint8_t, iSize.ValueOrDie()); return new (pData) StringData(nLen, usableLen); } CFX_WideString::~CFX_WideString() @@ -911,7 +911,7 @@ void CFX_WideString::FormatV(FX_LPCWSTR lpszFormat, va_list argList) case 'X': case 'o': if (nModifier & FORCE_INT64) { - va_arg(argList, FX_INT64); + va_arg(argList, int64_t); } else { va_arg(argList, int); } @@ -1068,7 +1068,7 @@ static const CFX_CharMap g_DefaultGBKMapper = {&_DefMap_GetWideString, &_DefMap_ static const CFX_CharMap g_DefaultJISMapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, &_DefMap_GetJISCodePage}; static const CFX_CharMap g_DefaultUHCMapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, &_DefMap_GetUHCCodePage}; static const CFX_CharMap g_DefaultBig5Mapper = {&_DefMap_GetWideString, &_DefMap_GetByteString, &_DefMap_GetBig5CodePage}; -CFX_CharMap* CFX_CharMap::GetDefaultMapper(FX_INT32 codepage) +CFX_CharMap* CFX_CharMap::GetDefaultMapper(int32_t codepage) { switch (codepage) { case 0: |