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/fpdfapi/fpdf_pageobj.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'core/include/fpdfapi/fpdf_pageobj.h') diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h index e78c9bb8b2..1b53bdc859 100644 --- a/core/include/fpdfapi/fpdf_pageobj.h +++ b/core/include/fpdfapi/fpdf_pageobj.h @@ -4,14 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDF_PAGEOBJ_H_ -#define _FPDF_PAGEOBJ_H_ -#ifndef _FPDF_RESOURCE_ -#include "fpdf_resource.h" -#endif -#ifndef _FX_GE_H_ +#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_ +#define CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_ + #include "../fxge/fx_ge.h" -#endif +#include "fpdf_resource.h" + class CPDF_Path; class CPDF_ClipPathData; class CPDF_ClipPath; @@ -717,4 +715,5 @@ protected: virtual void Transform(const CFX_AffineMatrix& matrix) {} virtual void CopyData(const CPDF_PageObject* pSrcObjet) {} }; -#endif + +#endif // CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_ -- cgit v1.2.3