summaryrefslogtreecommitdiff
path: root/core/include/fxge
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-27 16:07:42 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-27 16:07:42 -0700
commit14f57a153dcbc4c5fedeffe12a3b4f915cc5d558 (patch)
treec30bc8fde0acbac964db8bc9e96e893d57cc29f8 /core/include/fxge
parentcddfde0cddbc8467e0d5fa04c30405ee257750fc (diff)
downloadpdfium-14f57a153dcbc4c5fedeffe12a3b4f915cc5d558.tar.xz
Remove rendundant ../include from paths of files in include/ directory
Tiny bit of tidying I noticed while trying to figure out include rules. In other words, cd core/include git grep 'include.*include' git grep 'include.*src' Should produce no output, and cd fpdfsdk/include git grep 'include.*include' | grep -v ../core/include git grep 'include.*src' Should produce no output as well. Fix some IWYU, header guards, include ordering, whitespace along the way. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1162453003
Diffstat (limited to 'core/include/fxge')
-rw-r--r--core/include/fxge/fx_font.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 6e0c1ba881..7ae3c6d39d 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;
@@ -433,4 +431,5 @@ protected:
~IFX_GSUBTable() { }
};
IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
-#endif
+
+#endif // FX_FONT_H_