From 19922bbc0d62b81e0fdd6a01da39e9b875c53c68 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 28 May 2015 13:23:12 -0700 Subject: Merge to XFA: Fix ALL the include guards. Original Review URL: https://codereview.chromium.org/1160443004 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1162013003 --- core/include/reflow/fpdf_layout.h | 7 ++++--- core/include/reflow/reflowengine.h | 13 ++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'core/include/reflow') diff --git a/core/include/reflow/fpdf_layout.h b/core/include/reflow/fpdf_layout.h index fc01ba30c8..ebd879c764 100644 --- a/core/include/reflow/fpdf_layout.h +++ b/core/include/reflow/fpdf_layout.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDFAPI_LAYOUT_H_ -#define _FPDFAPI_LAYOUT_H_ +#ifndef CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_ +#define CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_ + class IPDF_LayoutElement; class IPDF_LayoutProcessor; class IPDF_LayoutProvider; @@ -277,4 +278,4 @@ public: virtual IPDF_LayoutElement* GetRoot() = 0; }; -#endif +#endif // CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_ diff --git a/core/include/reflow/reflowengine.h b/core/include/reflow/reflowengine.h index e6a5265db3..af3c943e97 100644 --- a/core/include/reflow/reflowengine.h +++ b/core/include/reflow/reflowengine.h @@ -4,13 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _REFLOW_ENGINE_H -#define _REFLOW_ENGINE_H +#ifndef CORE_INCLUDE_REFLOW_REFLOWENGINE_H_ +#define CORE_INCLUDE_REFLOW_REFLOWENGINE_H_ + +#include "../fpdfapi/fpdf_pageobj.h" #include "../fpdfapi/fpdf_render.h" +#include "../fpdfdoc/fpdf_tagged.h" #include "../fpdftext/fpdf_text.h" #include "fpdf_layout.h" -#include "../fpdfapi/fpdf_pageobj.h" -#include "../fpdfdoc/fpdf_tagged.h" + class IPDF_ReflowedPage { public: @@ -73,4 +75,5 @@ public: IPDF_ReflowedPage* Create_ReflowPage(); IPDF_ProgressiveReflowPageParser* Create_ReflowPageParser(); IPDF_ProgressiveReflowPageRender* Create_ReflowPageRender(); -#endif + +#endif // CORE_INCLUDE_REFLOW_REFLOWENGINE_H_ -- cgit v1.2.3