From 270452a44653773b3dc584729ec438ff922e2739 Mon Sep 17 00:00:00 2001 From: Michiharu Ariza Date: Wed, 15 Aug 2018 13:15:08 -0700 Subject: [PATCH] fix build attempt ^3 --- src/hb-cff-interp-common-private.hh | 2 -- src/hb-cff-interp-cs-common-private.hh | 1 + src/hb-cff-interp-cs.hh | 1 + src/hb-subset-cff.cc | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hb-cff-interp-common-private.hh b/src/hb-cff-interp-common-private.hh index 8cfa20a5a..0f81b48a4 100644 --- a/src/hb-cff-interp-common-private.hh +++ b/src/hb-cff-interp-common-private.hh @@ -26,8 +26,6 @@ #ifndef HB_CFF_INTERP_COMMON_PRIVATE_HH #define HB_CFF_INTERP_COMMON_PRIVATE_HH -#include "hb-common.h" - namespace CFF { using namespace OT; diff --git a/src/hb-cff-interp-cs-common-private.hh b/src/hb-cff-interp-cs-common-private.hh index 5507ee6cb..cf98e0f8f 100644 --- a/src/hb-cff-interp-cs-common-private.hh +++ b/src/hb-cff-interp-cs-common-private.hh @@ -26,6 +26,7 @@ #ifndef HB_CFF_INTERP_CS_COMMON_PRIVATE_HH #define HB_CFF_INTERP_CS_COMMON_PRIVATE_HH +#include "hb-private.hh" #include "hb-cff-interp-common-private.hh" namespace CFF { diff --git a/src/hb-cff-interp-cs.hh b/src/hb-cff-interp-cs.hh index 274c947d6..7b0a5aa54 100644 --- a/src/hb-cff-interp-cs.hh +++ b/src/hb-cff-interp-cs.hh @@ -26,6 +26,7 @@ #ifndef HB_CFF_INTERP_CS_HH #define HB_CFF_INTERP_CS_HH +#include "hb-private.hh" #include "hb-cff-interp-cs.hh" namespace CFF { diff --git a/src/hb-subset-cff.cc b/src/hb-subset-cff.cc index 03484dbe2..c14aaf13b 100644 --- a/src/hb-subset-cff.cc +++ b/src/hb-subset-cff.cc @@ -382,7 +382,7 @@ static inline bool _write_cff (const cff_subset_plan &plan, hb_serialize_context_t c (dest, dest_sz); char RETURN_OP[1] = { OpCode_return }; - const ByteStr NULL_SUBR = { RETURN_OP/* str */, 1/* len */ }; + const ByteStr NULL_SUBR (RETURN_OP, 1); OT::cff *cff = c.start_serialize (); if (unlikely (!c.extend_min (*cff)))