Resolve fde_xml.h header collision

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

Index: xfa/src/fdp/src/xml/fde_xml_imp.cpp
diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
similarity index 96%
rename from xfa/src/fdp/src/xml/fde_xml.cpp
rename to xfa/src/fdp/src/xml/fde_xml_imp.cpp
index 8725cb7655dc3b87fbd05866f9642b5de70c6a8b..6961aba6f8017a32cbc1b0d673f685d985b3c9fd 100644
--- a/xfa/src/fdp/src/xml/fde_xml.cpp
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
@@ -7,7 +7,7 @@
 #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
@@ -1320,8 +1320,7 @@ 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();
 }