Manual fixups to PDF_ENABLE_XFA in core/

core/include/fxcrt/fx_basic.h

Index: core/include/fxcrt/fx_basic.h
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 710bbcc3c3ac3a62c67690a5f92cd2d7d8a16855..e35084c3e86952f12e22dc4ba39d3781b585684f 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -193,7 +193,7 @@ class CFX_ArchiveLoader {
 
   FX_DWORD m_LoadingSize;
 };
-#endif
+#endif  // PDF_ENABLE_XFA
 
 class IFX_BufferArchive {
  public:
@@ -441,7 +441,7 @@ typedef CFX_ArrayTemplate<FX_FILESIZE> CFX_FileSizeArray;
 #ifdef PDF_ENABLE_XFA
 typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
 typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array;
-#endif
+#endif  // PDF_ENABLE_XFA
 
 template <class ObjectClass>
 class CFX_ObjectArray : public CFX_BasicArray {
@@ -728,9 +728,7 @@ class CFX_MapPtrTemplate : public CFX_MapPtrToPtr {
   FX_BOOL RemoveKey(KeyType key) {
     return CFX_MapPtrToPtr::RemoveKey((void*)(uintptr_t)key);
   }
-#endif
 
-#ifdef PDF_ENABLE_XFA
   void GetNextAssoc(FX_POSITION& rNextPosition,
                     KeyType& rKey,
                     ValueType& rValue) const {
@@ -741,7 +739,7 @@ class CFX_MapPtrTemplate : public CFX_MapPtrToPtr {
     rValue = (ValueType)(uintptr_t)pValue;
   }
 };
-#endif
+#endif  // PDF_ENABLE_XFA
 class CFX_CMapByteStringToPtr {
  public:
   CFX_CMapByteStringToPtr();
@@ -1203,7 +1201,7 @@ class IFX_Unknown {
   virtual FX_DWORD AddRef() = 0;
 };
 #define FX_IsOdd(a) ((a)&1)
-#endif
+#endif  // PDF_ENABLE_XFA
 
 class CFX_Vector_3by1 {
  public: