commit d60d7cb936ea50a0dfab26372f3a8958f84250e7
author Ryan Harrison <rharrison@chromium.org> Fri Jun 01 15:28:54 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jun 01 15:28:54 2018 +0000
tree 94a17b83ba7f2e6ff5715f15727e01d3a95e4cd9
parent 4f21d77576b371270375f1120cba5cf99c248e9d

Fix XFA guards

These guards are using #if, when they should be using #ifdef. Caught
using Clang's static analyzer.

Change-Id: I86e99c5e4142cf84fff5f2365ad534f09ae40511
Reviewed-on: https://pdfium-review.googlesource.com/33510
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

core/fxcrt/fx_bidi.h

diff --git a/core/fxcrt/fx_bidi.h b/core/fxcrt/fx_bidi.h
index 54d5255..79a2ddd 100644
--- a/core/fxcrt/fx_bidi.h
+++ b/core/fxcrt/fx_bidi.h
@@ -72,7 +72,7 @@
   CFX_BidiChar::Direction m_eOverallDirection = CFX_BidiChar::LEFT;
 };
 
-#if PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
 void FX_BidiLine(std::vector<CFX_Char>* chars, size_t iCount);
 #endif  // PDF_ENABLE_XFA
 

fxjs/cjs_document.cpp

diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index 24be12d..e087e0e 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -450,7 +450,7 @@
     // and creating a new pageview at this point will cause bad things.
     CPDFSDK_PageView* pPageView = m_pFormFillEnv->GetPageView(pPage, false);
     if (pPageView) {
-#if PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
       pPageView->DeleteAnnot(pWidget);
 #endif  // PDF_ENABLE_XFA
       pPageView->UpdateRects(aRefresh);

testing/test_support.h

diff --git a/testing/test_support.h b/testing/test_support.h
index f26e161..56b2f11 100644
--- a/testing/test_support.h
+++ b/testing/test_support.h
@@ -13,7 +13,7 @@
 
 #include "public/fpdfview.h"
 
-#if PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
 #include "xfa/fgas/font/cfgas_fontmgr.h"
 #endif  // PDF_ENABLE_XFA
 
@@ -118,7 +118,7 @@
   const size_t m_Len;
 };
 
-#if PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
 CFGAS_FontMgr* GetGlobalFontManager();
 #endif  // PDF_ENABLE_XFA
 

testing/unit_test_main.cpp

diff --git a/testing/unit_test_main.cpp b/testing/unit_test_main.cpp
index 92dceef..70eb51a 100644
--- a/testing/unit_test_main.cpp
+++ b/testing/unit_test_main.cpp
@@ -15,7 +15,7 @@
 #include "v8/include/v8.h"
 #endif  // PDF_ENABLE_V8
 
-#if PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
 #include "core/fxge/cfx_fontmgr.h"
 #include "core/fxge/cfx_gemodule.h"
 #include "xfa/fgas/font/cfgas_fontmgr.h"
@@ -74,7 +74,7 @@
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 #endif  // PDF_ENABLE_V8
 
-#if PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
   env_ = new Environment();
   // The env will be deleted by gtest.
   AddGlobalTestEnvironment(env_);