4 files changed, 9 insertions, 10 deletions

diff --git a/xfa/fxfa/app/cxfa_textlayout.cpp b/xfa/fxfa/app/cxfa_textlayout.cpp
index 9f4962e458..2470459b31 100644
--- a/xfa/fxfa/app/cxfa_textlayout.cpp
+++ b/xfa/fxfa/app/cxfa_textlayout.cpp
@@ -601,7 +601,7 @@ bool CXFA_TextLayout::DrawString(CFX_RenderDevice* pFxDevice,
         pCharPos = FX_Alloc(FXTEXT_CHARPOS, iChars);
         iCharCount = iChars;
       }
-      FXSYS_memset(pCharPos, 0, iCharCount * sizeof(FXTEXT_CHARPOS));
+      memset(pCharPos, 0, iCharCount * sizeof(FXTEXT_CHARPOS));
       RenderString(pDevice.get(), pSolidBrush.get(), pPieceLine, j, pCharPos,
                    tmDoc2Device);
     }
diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp
index 40341ad90c..78de94e938 100644
--- a/xfa/fxfa/cxfa_ffapp.cpp
+++ b/xfa/fxfa/cxfa_ffapp.cpp
@@ -70,7 +70,7 @@ bool CXFA_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) {
     const auto& acc = m_Data[index];
     uint32_t dwSize = acc->GetSize();
     size_t dwRead = std::min(size, static_cast<size_t>(dwSize - offset));
-    FXSYS_memcpy(buffer, acc->GetData() + offset, dwRead);
+    memcpy(buffer, acc->GetData() + offset, dwRead);
     size -= dwRead;
     if (size == 0)
       return true;
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index d38a6715e8..83742d9609 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -3557,8 +3557,8 @@ void CXFA_FM2JSContext::DecodeXML(const CFX_ByteStringC& szXMLString,
     const wchar_t* const strName[] = {L"quot", L"amp", L"apos", L"lt", L"gt"};
     int32_t iIndex = 0;
     while (iIndex < 5) {
-      if (FXSYS_memcmp(strString, strName[iIndex],
-                       FXSYS_wcslen(strName[iIndex])) == 0) {
+      if (memcmp(strString, strName[iIndex], FXSYS_wcslen(strName[iIndex])) ==
+          0) {
         break;
       }
       ++iIndex;
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());
     }