Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

fpdfsdk/src/fpdfppo.cpp

Index: fpdfsdk/src/fpdfppo.cpp
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp
index 6ae6531e4a2885c42ce307c71721af632e5e0e84..efb155181a33efcdbab084faaee978df65a1698f 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/src/fpdfppo.cpp
@@ -6,7 +6,9 @@
 
 #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"
 
@@ -301,6 +303,9 @@ FX_DWORD CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc,
   }
   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;