Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

fpdfsdk/src/fpdfppo.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 "public/fpdf_ppo.h"
 
+#ifdef PDF_ENABLE_XFA
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
+#endif
 #include "fpdfsdk/include/fsdk_define.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 class CPDF_PageOrganizer {
  public:
   using ObjectNumberMap = std::map<FX_DWORD, FX_DWORD>;
   CPDF_PageOrganizer();
   ~CPDF_PageOrganizer();
 
   FX_BOOL PDFDocInit(CPDF_Document* pDestPDFDoc, CPDF_Document* pSrcPDFDoc);
@@ skipping 274 matching lines @@
         return 4;
       }
       if (!FXSYS_stricmp(strType, "Page")) {
         pDictClone->Release();
         return 0;
       }
     }
   }
   dwNewObjNum = pDoc->AddIndirectObject(pClone);
   (*pObjNumberMap)[dwObjnum] = dwNewObjNum;
+#ifndef PDF_ENABLE_XFA
+

[Lei Zhang, 2015/11/25 00:12:02]

If this is the only difference, then the #include is probably not needed above.

[Tom Sepez, 2015/11/25 21:45:29]

Sadly, it is needed since it breaks IWYU elsewhere !!!  I took a stab at fixing
it, but it was involved.

[Lei Zhang, 2015/11/25 21:51:34]

Ouch. Add a TODO?

[Tom Sepez, 2015/11/25 23:08:22]

Actually, I'm lying.  It works today.  The last time I tried it, fsdk_define had
problems.

+#endif
   if (!UpdateReference(pClone, pDoc, pObjNumberMap)) {
     pClone->Release();
     return 0;
   }
   return dwNewObjNum;
 }
 
 FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
                                 CFX_WordArray* pageArray,
                                 int nCount) {
@@ skipping 87 matching lines @@
   if (!pSrcDict)
     return FALSE;
 
   CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
   if (!pDstDict)
     return FALSE;
 
   pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
   return TRUE;
 }