From 04db653b2b4c266036fbd274b53f0763e35f4ee6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 27 May 2015 16:24:18 -0700 Subject: Merge to XFA: Remove rendundant ../include from paths. Original Review URL: https://codereview.chromium.org/1162453003 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1154613005 --- core/include/fxge/fx_font.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'core/include/fxge/fx_font.h') diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 5cf6b38a03..adf7e6251c 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -4,14 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_FONT_H_ -#define _FX_FONT_H_ -#ifndef _FXCRT_EXTENSION_ -#include "../../include/fxcrt/fx_ext.h" -#endif -#ifndef _FX_DIB_H_ +#ifndef FX_FONT_H_ +#define FX_FONT_H_ + +#include "../fxcrt/fx_ext.h" #include "fx_dib.h" -#endif + typedef struct FT_FaceRec_* FXFT_Face; typedef void* FXFT_Library; class IFX_FontEncoding; @@ -474,4 +472,5 @@ protected: ~IFX_GSUBTable() { } }; IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont); -#endif + +#endif // FX_FONT_H_ -- cgit v1.2.3