From 1d1afddfd21155ef136c2d96b1d6c286bdc8925f Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Wed, 29 Aug 2018 13:36:39 -0700
Subject: [PATCH] corrected preprocessor guards

---
 src/hb-cff-interp-common.hh      | 6 +++---
 src/hb-cff-interp-cs-common.hh   | 6 +++---
 src/hb-cff-interp-dict-common.hh | 6 +++---
 src/hb-ot-cff-common.hh          | 6 +++---
 src/hb-subset-cff-common.hh      | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/hb-cff-interp-common.hh b/src/hb-cff-interp-common.hh
index 79add1210..310cc4c14 100644
--- a/src/hb-cff-interp-common.hh
+++ b/src/hb-cff-interp-common.hh
@@ -23,8 +23,8 @@
  *
  * Adobe Author(s): Michiharu Ariza
  */
-#ifndef HB_CFF_INTERP_COMMON_PRIVATE_HH
-#define HB_CFF_INTERP_COMMON_PRIVATE_HH
+#ifndef HB_CFF_INTERP_COMMON_HH
+#define HB_CFF_INTERP_COMMON_HH
 
 namespace CFF {
 
@@ -626,4 +626,4 @@ struct Interpreter {
 
 } /* namespace CFF */
 
-#endif /* HB_CFF_INTERP_COMMON_PRIVATE_HH */
+#endif /* HB_CFF_INTERP_COMMON_HH */
diff --git a/src/hb-cff-interp-cs-common.hh b/src/hb-cff-interp-cs-common.hh
index a1ab47281..9e22b1e64 100644
--- a/src/hb-cff-interp-cs-common.hh
+++ b/src/hb-cff-interp-cs-common.hh
@@ -23,8 +23,8 @@
  *
  * Adobe Author(s): Michiharu Ariza
  */
-#ifndef HB_CFF_INTERP_CS_COMMON_PRIVATE_HH
-#define HB_CFF_INTERP_CS_COMMON_PRIVATE_HH
+#ifndef HB_CFF_INTERP_CS_COMMON_HH
+#define HB_CFF_INTERP_CS_COMMON_HH
 
 #include "hb.hh"
 #include "hb-cff-interp-common.hh"
@@ -320,4 +320,4 @@ struct CSInterpreter : Interpreter<ENV>
 
 } /* namespace CFF */
 
-#endif /* HB_CFF_INTERP_CS_COMMON_PRIVATE_HH */
+#endif /* HB_CFF_INTERP_CS_COMMON_HH */
diff --git a/src/hb-cff-interp-dict-common.hh b/src/hb-cff-interp-dict-common.hh
index 655729046..32ed39e98 100644
--- a/src/hb-cff-interp-dict-common.hh
+++ b/src/hb-cff-interp-dict-common.hh
@@ -23,8 +23,8 @@
  *
  * Adobe Author(s): Michiharu Ariza
  */
-#ifndef HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH
-#define HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH
+#ifndef HB_CFF_INTERP_DICT_COMMON_HH
+#define HB_CFF_INTERP_DICT_COMMON_HH
 
 #include "hb-cff-interp-common.hh"
 
@@ -205,4 +205,4 @@ struct DictInterpreter : Interpreter<InterpEnv>
 
 } /* namespace CFF */
 
-#endif /* HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH */
+#endif /* HB_CFF_INTERP_DICT_COMMON_HH */
diff --git a/src/hb-ot-cff-common.hh b/src/hb-ot-cff-common.hh
index b5ab0e7d0..3aa1c34da 100644
--- a/src/hb-ot-cff-common.hh
+++ b/src/hb-ot-cff-common.hh
@@ -23,8 +23,8 @@
  *
  * Adobe Author(s): Michiharu Ariza
  */
-#ifndef HB_OT_CFF_COMMON_PRIVATE_HH
-#define HB_OT_CFF_COMMON_PRIVATE_HH
+#ifndef HB_OT_CFF_COMMON_HH
+#define HB_OT_CFF_COMMON_HH
 
 #include "hb-open-type.hh"
 #include "hb-ot-layout-common.hh"
@@ -619,5 +619,5 @@ struct Subrs : CFFIndex<COUNT>
 
 } /* namespace CFF */
 
-#endif /* HB_OT_CFF_COMMON_PRIVATE_HH */
+#endif /* HB_OT_CFF_COMMON_HH */
 
diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index 883584be0..4ed8248d3 100644
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -24,8 +24,8 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
-#ifndef HB_SUBSET_CFF_COMMON_PRIVATE_HH
-#define HB_SUBSET_CFF_COMMON_PRIVATE_HH
+#ifndef HB_SUBSET_CFF_COMMON_HH
+#define HB_SUBSET_CFF_COMMON_HH
 
 #include "hb.hh"
 
@@ -230,4 +230,4 @@ hb_serialize_cff_fdselect (hb_serialize_context_t *c,
                           const hb_vector_t<hb_codepoint_t> &first_glyphs,
                           const CFF::FDMap &fdmap);
 
-#endif /* HB_SUBSET_CFF_COMMON_PRIVATE_HH */
+#endif /* HB_SUBSET_CFF_COMMON_HH */