From 42234424a0fc43d298be082b4c7b1e288e94bbb6 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Thu, 8 Feb 2018 15:11:15 -0800 Subject: [PATCH] Fix include gaurds and include order in hb-subset-glyf and hb-subset-plan --- src/hb-subset-glyf.hh | 6 ++++-- src/hb-subset-plan.cc | 2 +- src/hb-subset-plan.hh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/hb-subset-glyf.hh b/src/hb-subset-glyf.hh index c802da249..035085f03 100644 --- a/src/hb-subset-glyf.hh +++ b/src/hb-subset-glyf.hh @@ -24,8 +24,10 @@ * Google Author(s): Garret Rieger */ -#ifndef HB_SUBSET_GLYF_H -#define HB_SUBSET_GLYF_H +#ifndef HB_SUBSET_GLYF_HH +#define HB_SUBSET_GLYF_HH + +#include "hb-private.hh" #include "hb-subset-plan.hh" diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 20185e1d8..6f889b3c5 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -24,9 +24,9 @@ * Google Author(s): Garret Rieger, Roderick Sheeter */ -#include "hb-subset-plan.hh" #include "hb-subset-private.hh" +#include "hb-subset-plan.hh" #include "hb-ot-cmap-table.hh" hb_bool_t diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh index 1e572a43c..a1e4e9e9c 100644 --- a/src/hb-subset-plan.hh +++ b/src/hb-subset-plan.hh @@ -24,10 +24,11 @@ * Google Author(s): Garret Rieger */ -#ifndef HB_SUBSET_PLAN_H -#define HB_SUBSET_PLAN_H +#ifndef HB_SUBSET_PLAN_HH +#define HB_SUBSET_PLAN_HH #include "hb-private.hh" + #include "hb-object-private.hh" struct hb_subset_plan_t {