From 1c5d0b48ec7a6443ba72fec2a58a65fc6d694aca Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 3 Apr 2017 15:05:11 -0400 Subject: Drop FXSYS_ from mem methods This Cl drops the FXSYS_ from mem methods which are the same on all platforms. Bug: pdfium:694 Change-Id: I9d5ae905997dbaaec5aa0b2ae4c07358ed9c6236 Reviewed-on: https://pdfium-review.googlesource.com/3613 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_node.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_node.cpp') diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 75a125b2d9..2828c98343 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -3747,13 +3747,13 @@ bool CXFA_Node::TryMeasure(XFA_ATTRIBUTE eAttr, void* pValue; int32_t iBytes; if (GetMapModuleBuffer(pKey, pValue, iBytes) && iBytes == sizeof(mValue)) { - FXSYS_memcpy(&mValue, pValue, sizeof(mValue)); + memcpy(&mValue, pValue, sizeof(mValue)); return true; } if (bUseDefault && XFA_GetAttributeDefaultValue(pValue, GetElementType(), eAttr, XFA_ATTRIBUTETYPE_Measure, m_ePacket)) { - FXSYS_memcpy(&mValue, pValue, sizeof(mValue)); + memcpy(&mValue, pValue, sizeof(mValue)); return true; } return false; @@ -4020,7 +4020,7 @@ bool CXFA_Node::TryUserData(void* pKey, void*& pData, bool bProtoAlso) { if (!GetMapModuleBuffer(pKey, pData, iBytes, bProtoAlso)) { return false; } - return iBytes == sizeof(void*) && FXSYS_memcpy(&pData, pData, iBytes); + return iBytes == sizeof(void*) && memcpy(&pData, pData, iBytes); } bool CXFA_Node::SetScriptContent(const CFX_WideString& wsContent, @@ -4889,7 +4889,7 @@ void CXFA_Node::SetMapModuleBuffer( pBuffer->pCallbackInfo = pCallbackInfo; pBuffer->iBytes = iBytes; - FXSYS_memcpy(pBuffer->GetData(), pValue, iBytes); + memcpy(pBuffer->GetData(), pValue, iBytes); } bool CXFA_Node::GetMapModuleBuffer(void* pKey, @@ -5006,8 +5006,7 @@ void CXFA_Node::MergeAllData(void* pDstModule) { } pDstBuffer->pCallbackInfo = pSrcBuffer->pCallbackInfo; pDstBuffer->iBytes = pSrcBuffer->iBytes; - FXSYS_memcpy(pDstBuffer->GetData(), pSrcBuffer->GetData(), - pSrcBuffer->iBytes); + memcpy(pDstBuffer->GetData(), pSrcBuffer->GetData(), pSrcBuffer->iBytes); if (pDstBuffer->pCallbackInfo && pDstBuffer->pCallbackInfo->pCopy) { pDstBuffer->pCallbackInfo->pCopy(*(void**)pDstBuffer->GetData()); } -- cgit v1.2.3