Manual fixups to PDF_ENABLE_XFA in core/

core/include/fxcrt/fx_basic.h

 // 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
 
 #ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
 #define CORE_INCLUDE_FXCRT_FX_BASIC_H_
 
 #include "fx_memory.h"
@@ skipping 175 matching lines @@
 
   FX_BOOL Read(void* pBuf, FX_DWORD dwSize);
 
  protected:
   FX_DWORD m_LoadingPos;
 
   const uint8_t* m_pLoadingBuf;
 
   FX_DWORD m_LoadingSize;
 };
-#endif
+#endif  // PDF_ENABLE_XFA
 
 class IFX_BufferArchive {
  public:
   IFX_BufferArchive(FX_STRSIZE size);
   virtual ~IFX_BufferArchive() {}
 
   virtual void Clear();
 
   FX_BOOL Flush();
 
@@ skipping 227 matching lines @@
   }
 };
 typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
 typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray;
 typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray;
 typedef CFX_ArrayTemplate<void*> CFX_PtrArray;
 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 {
  public:
   CFX_ObjectArray() : CFX_BasicArray(sizeof(ObjectClass)) {}
 
   ~CFX_ObjectArray() { RemoveAll(); }
 
   void Add(const ObjectClass& data) {
     new ((void*)InsertSpaceAt(m_nSize, 1)) ObjectClass(data);
@@ skipping 266 matching lines @@
     return (ValueType&)CFX_MapPtrToPtr::operator[]((void*)(uintptr_t)key);
   }
 
   void SetAt(KeyType key, ValueType newValue) {
     CFX_MapPtrToPtr::SetAt((void*)(uintptr_t)key, (void*)(uintptr_t)newValue);
   }
 
   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 {
     void* pKey = NULL;
     void* pValue = NULL;
     CFX_MapPtrToPtr::GetNextAssoc(rNextPosition, pKey, pValue);
     rKey = (KeyType)(uintptr_t)pKey;
     rValue = (ValueType)(uintptr_t)pValue;
   }
 };
-#endif
+#endif  // PDF_ENABLE_XFA
 class CFX_CMapByteStringToPtr {
  public:
   CFX_CMapByteStringToPtr();
 
   ~CFX_CMapByteStringToPtr();
 
   void RemoveAll();
 
   FX_POSITION GetStartPosition() const;
 
@@ skipping 441 matching lines @@
 #define ProgressiveStatus FX_ProgressiveStatus
 #define FX_NAMESPACE_DECLARE(namespace, type) namespace ::type
 #ifdef PDF_ENABLE_XFA
 class IFX_Unknown {
  public:
   virtual ~IFX_Unknown() {}
   virtual FX_DWORD Release() = 0;
   virtual FX_DWORD AddRef() = 0;
 };
 #define FX_IsOdd(a) ((a)&1)
-#endif
+#endif  // PDF_ENABLE_XFA
 
 class CFX_Vector_3by1 {
  public:
   CFX_Vector_3by1() : a(0.0f), b(0.0f), c(0.0f) {}
 
   CFX_Vector_3by1(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1)
       : a(a1), b(b1), c(c1) {}
 
   FX_FLOAT a;
   FX_FLOAT b;
@@ skipping 34 matching lines @@
   FX_FLOAT c;
   FX_FLOAT d;
   FX_FLOAT e;
   FX_FLOAT f;
   FX_FLOAT g;
   FX_FLOAT h;
   FX_FLOAT i;
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_BASIC_H_