Merge to XFA: Switch most min/max macros to std::min/max.

xfa/src/fdp/src/xml/fde_xml.cpp

Index: xfa/src/fdp/src/xml/fde_xml.cpp
diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml.cpp
index aa217227c41ec61fb2862b85b59083e3ff59d269..8725cb7655dc3b87fbd05866f9642b5de70c6a8b 100644
--- a/xfa/src/fdp/src/xml/fde_xml.cpp
+++ b/xfa/src/fdp/src/xml/fde_xml.cpp
@@ -4,6 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include <algorithm>
+
 #include "xfa/src/foxitlib.h"
 #include "fde_xml.h"
 #ifdef __cplusplus
@@ -1484,7 +1486,7 @@ void CFDE_XMLSyntaxParser::Init(IFX_Stream* pStream,
   int32_t iStreamLength = pStream->GetLength();
   FXSYS_assert(iStreamLength > 0);
   m_pStream = pStream;
-  m_iXMLPlaneSize = FX_MIN(iXMLPlaneSize, iStreamLength);
+  m_iXMLPlaneSize = std::min(iXMLPlaneSize, iStreamLength);
   uint8_t bom[4];
   m_iCurrentPos = m_pStream->GetBOM(bom);
   FXSYS_assert(m_pBuffer == NULL);
@@ -2002,7 +2004,7 @@ void CFDE_XMLSyntaxParser::Init(IFX_Stream* pStream,
   int32_t iStreamLength = pStream->GetLength();
   FXSYS_assert(iStreamLength > 0);
   m_pStream = pStream;
-  m_iXMLPlaneSize = FX_MIN(iXMLPlaneSize, iStreamLength);
+  m_iXMLPlaneSize = std::min(iXMLPlaneSize, iStreamLength);
   m_iTextDataSize = iTextDataSize;
   uint8_t bom[4];
   m_iCurrentPos = m_pStream->GetBOM(bom);