Resolve fde_xml.h header collision

xfa/src/fdp/src/xml/fde_xml_imp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "xfa/src/foxitlib.h"
-#include "fde_xml.h"
+#include "fde_xml_imp.h"

[Lei Zhang, 2016/01/12 22:27:23]

xfa/src/fdp/src/xml/fde_xml_imp.h, and move it to the top if you dare?

 #ifdef __cplusplus
 extern "C" {
 #endif
 #define FDE_XMLVALIDCHARRANGENUM 5
 static FX_WCHAR g_XMLValidCharRange[FDE_XMLVALIDCHARRANGENUM][2] = {
     {0x09, 0x09},
     {0x0A, 0x0A},
     {0x0D, 0x0D},
     {0x20, 0xD7FF},
     {0xE000, 0xFFFD}};
@@ skipping 1292 matching lines @@
 }
 inline void CFDE_XMLSAXParser::Pop() {
   m_TagStack.Pop();
   m_pTagTop = m_TagStack.GetTopElement();
 }
 #ifdef _FDE_BLOCK_BUFFER
 CFDE_BlockBuffer::CFDE_BlockBuffer(int32_t iAllocStep)
     : m_iDataLength(0),
       m_iBufferSize(0),
       m_iAllocStep(iAllocStep),
-      m_iStartPosition(0) {
-}
+      m_iStartPosition(0) {}
 CFDE_BlockBuffer::~CFDE_BlockBuffer() {
   ClearBuffer();
 }
 FX_WCHAR* CFDE_BlockBuffer::GetAvailableBlock(int32_t& iIndexInBlock) {
   iIndexInBlock = 0;
   if (!m_BlockArray.GetSize()) {
     return nullptr;
   }
   int32_t iRealIndex = m_iStartPosition + m_iDataLength;
   if (iRealIndex == m_iBufferSize) {
@@ skipping 1294 matching lines @@
     m_iTextDataSize += 1024 * 1024;
   }
   m_pwsTextData = FX_Realloc(FX_WCHAR, m_pwsTextData, m_iTextDataSize);
 }
 void CFDE_XMLSyntaxParser::GetData(CFX_WideString& wsData) const {
   FX_WCHAR* pBuf = wsData.GetBuffer(m_iTextDataLength);
   FXSYS_memcpy(pBuf, m_pwsTextData, m_iTextDataLength * sizeof(FX_WCHAR));
   wsData.ReleaseBuffer(m_iTextDataLength);
 }
 #endif