Fix include gaurds and include order in hb-subset-glyf and hb-subset-plan

7 years ago · 42234424a0
parent 0f3c756cbf
commit 42234424a0
3 changed files with 8 additions and 5 deletions
--- 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"

--- 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
--- 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 {