Tidy ifdefs in fpdfsdk.

fpdfsdk/include/fsdk_define.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 FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 
-#ifndef PDF_ENABLE_XFA
+#include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_pageobj.h"
+#include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fpdfapi/fpdf_render.h"
+#include "core/include/fpdfapi/fpdf_serial.h"
 #include "core/include/fpdfapi/fpdfapi.h"
-#else
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fpdfdoc/fpdf_vt.h"
+#include "core/include/fxge/fx_ge.h"
+#include "core/include/fxge/fx_ge_win32.h"
+#include "public/fpdfview.h"
+
+#ifdef PDF_ENABLE_XFA
 #include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 #include "../../xfa/include/fxbarcode/BC_BarCode.h"
 #include "../../xfa/include/fxfa/fxfa.h"
 #include "../../xfa/include/fxgraphics/fx_graphics.h"
 #include "../../xfa/include/fxjse/fxjse.h"
-#endif
-#include "core/include/fpdfapi/fpdf_module.h"
-#include "core/include/fpdfapi/fpdf_pageobj.h"
-#include "core/include/fpdfapi/fpdf_parser.h"
-#include "core/include/fpdfapi/fpdf_render.h"
-#include "core/include/fpdfapi/fpdf_serial.h"
-#ifdef PDF_ENABLE_XFA
-#include "core/include/fpdfapi/fpdfapi.h"
-#endif
-#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fpdfdoc/fpdf_vt.h"
-#include "core/include/fxge/fx_ge.h"
-#include "core/include/fxge/fx_ge_win32.h"
-#ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
-#endif
-#include "public/fpdfview.h"
+#endif  // PDF_ENABLE_XFA
 
 #ifdef _WIN32
 #include <tchar.h>
 #include <math.h>
 #endif
 
 // Convert a #FX_ARGB to a #FX_COLORREF.
 #define FX_ARGBTOCOLORREF(argb)                                            \
   ((((FX_DWORD)argb & 0x00FF0000) >> 16) | ((FX_DWORD)argb & 0x0000FF00) | \
    (((FX_DWORD)argb & 0x000000FF) << 16))
@@ skipping 14 matching lines @@
 
   // IFX_FileRead
   FX_FILESIZE GetSize() override { return m_FileAccess.m_FileLen; }
   void Release() override { delete this; }
   FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
 
 #ifdef PDF_ENABLE_XFA
   virtual CFX_ByteString GetFullPath() { return ""; }
   virtual FX_BOOL GetByte(FX_DWORD pos, uint8_t& ch);
   virtual FX_BOOL GetBlock(FX_DWORD pos, uint8_t* pBuf, FX_DWORD size);
+#endif  // PDF_ENABLE_XFA
 
-#endif
  private:
   FPDF_FILEACCESS m_FileAccess;
 #ifdef PDF_ENABLE_XFA
   uint8_t m_Buffer[512];
   FX_DWORD m_BufferOffset;
+#endif  // PDF_ENABLE_XFA
 };
 
+#ifdef PDF_ENABLE_XFA
 class CFPDF_FileStream : public IFX_FileStream {
  public:
   CFPDF_FileStream(FPDF_FILEHANDLER* pFS);
   virtual ~CFPDF_FileStream() {}
 
   virtual IFX_FileStream* Retain();
   virtual void Release();
 
   virtual FX_FILESIZE GetSize();
   virtual FX_BOOL IsEOF();
   virtual FX_FILESIZE GetPosition() { return m_nCurPos; }
   virtual void SetPosition(FX_FILESIZE pos) { m_nCurPos = pos; }
   virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size);
   virtual size_t ReadBlock(void* buffer, size_t size);
   virtual FX_BOOL WriteBlock(const void* buffer,
                              FX_FILESIZE offset,
                              size_t size);
   virtual FX_BOOL Flush();
 
  protected:
   FPDF_FILEHANDLER* m_pFS;
   FX_FILESIZE m_nCurPos;
-#endif
 };
+#endif  // PDF_ENABLE_XFA
 
 // Object types for public FPDF_ types; these correspond to next layer down
 // from fpdfsdk. For master, these are CPDF_ types, but for XFA, these are
 // CPDFXFA_ types.
 #ifndef PDF_ENABLE_XFA
 using UnderlyingDocumentType = CPDF_Document;
 using UnderlyingPageType = CPDF_Page;
-#else
+#else   // PDF_ENABLE_XFA
 using UnderlyingDocumentType = CPDFXFA_Document;
 using UnderlyingPageType = CPDFXFA_Page;
-#endif
+#endif  // PDF_ENABLE_XFA
 
 // Conversions to/from underlying types.
 UnderlyingDocumentType* UnderlyingFromFPDFDocument(FPDF_DOCUMENT doc);
 FPDF_DOCUMENT FPDFDocumentFromUnderlying(UnderlyingDocumentType* doc);
 
 UnderlyingPageType* UnderlyingFromFPDFPage(FPDF_PAGE page);
 
 // Conversions to/from FPDF_ types.
 CPDF_Document* CPDFDocumentFromFPDFDocument(FPDF_DOCUMENT doc);
 FPDF_DOCUMENT FPDFDocumentFromCPDFDocument(CPDF_Document* doc);
@@ skipping 12 matching lines @@
                             int rotate,
                             int flags,
                             FX_BOOL bNeedToRestore,
                             IFSDK_PAUSE_Adapter* pause);
 
 void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code);
 void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot);
 void ProcessParseError(FX_DWORD err_code);
 
 #endif  // FPDFSDK_INCLUDE_FSDK_DEFINE_H_