From be458eb05962dd5f5c60a25f54cf0b20e7d8b055 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 10 Jul 2018 14:41:04 +0200 Subject: [PATCH] Include more basic internal headers from hb-private.hh --- src/hb-blob-private.hh | 2 -- src/hb-blob.cc | 1 - src/hb-buffer-private.hh | 1 - src/hb-common.cc | 2 -- src/hb-coretext.cc | 1 - src/hb-directwrite.cc | 1 - src/hb-face-private.hh | 1 - src/hb-font-private.hh | 1 - src/hb-ft.cc | 1 - src/hb-map-private.hh | 1 - src/hb-object-private.hh | 4 ---- src/hb-open-type-private.hh | 1 - src/hb-ot-layout-common-private.hh | 1 - src/hb-ot-layout-gsubgpos-private.hh | 1 - src/hb-ot-shape-complex-arabic.cc | 1 - src/hb-private.hh | 6 +++++- src/hb-set-private.hh | 1 - src/hb-shape-plan-private.hh | 1 - src/hb-shape-plan.cc | 1 - src/hb-subset-input.cc | 1 - src/hb-subset-plan.hh | 1 - src/hb-subset.cc | 1 - src/hb-unicode-private.hh | 1 - src/hb-uniscribe.cc | 1 - src/hb-warning.cc | 4 +--- 25 files changed, 6 insertions(+), 32 deletions(-) diff --git a/src/hb-blob-private.hh b/src/hb-blob-private.hh index b72fa721b..56a7b668b 100644 --- a/src/hb-blob-private.hh +++ b/src/hb-blob-private.hh @@ -31,8 +31,6 @@ #include "hb-private.hh" -#include "hb-object-private.hh" - /* * hb_blob_t diff --git a/src/hb-blob.cc b/src/hb-blob.cc index b509093e0..5bab1abbe 100644 --- a/src/hb-blob.cc +++ b/src/hb-blob.cc @@ -31,7 +31,6 @@ #endif #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-blob-private.hh" #ifdef HAVE_SYS_MMAN_H diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh index dd6f1dcd3..f45814070 100644 --- a/src/hb-buffer-private.hh +++ b/src/hb-buffer-private.hh @@ -31,7 +31,6 @@ #define HB_BUFFER_PRIVATE_HH #include "hb-private.hh" -#include "hb-object-private.hh" #include "hb-unicode-private.hh" diff --git a/src/hb-common.cc b/src/hb-common.cc index ca2b32784..243c2163e 100644 --- a/src/hb-common.cc +++ b/src/hb-common.cc @@ -28,8 +28,6 @@ #include "hb-private.hh" -#include "hb-mutex-private.hh" -#include "hb-object-private.hh" #include #ifdef HAVE_XLOCALE_H diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 61f9c35a1..3bdc3f784 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -29,7 +29,6 @@ #define HB_SHAPER coretext #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-shaper-impl-private.hh" #include "hb-coretext.h" diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc index 187ab3f9d..7c688494f 100644 --- a/src/hb-directwrite.cc +++ b/src/hb-directwrite.cc @@ -23,7 +23,6 @@ */ #include "hb-private.hh" -#include "hb-debug.hh" #define HB_SHAPER directwrite #include "hb-shaper-impl-private.hh" diff --git a/src/hb-face-private.hh b/src/hb-face-private.hh index 43e7b1cb3..fe3b8b240 100644 --- a/src/hb-face-private.hh +++ b/src/hb-face-private.hh @@ -31,7 +31,6 @@ #include "hb-private.hh" -#include "hb-object-private.hh" #include "hb-shaper-private.hh" #include "hb-shape-plan-private.hh" diff --git a/src/hb-font-private.hh b/src/hb-font-private.hh index 7ba16cdef..9f657db60 100644 --- a/src/hb-font-private.hh +++ b/src/hb-font-private.hh @@ -31,7 +31,6 @@ #include "hb-private.hh" -#include "hb-object-private.hh" #include "hb-face-private.hh" #include "hb-shaper-private.hh" diff --git a/src/hb-ft.cc b/src/hb-ft.cc index 7caafba83..6670d9a60 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -28,7 +28,6 @@ */ #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-ft.h" diff --git a/src/hb-map-private.hh b/src/hb-map-private.hh index c4f2fc7da..00f089e81 100644 --- a/src/hb-map-private.hh +++ b/src/hb-map-private.hh @@ -28,7 +28,6 @@ #define HB_MAP_PRIVATE_HH #include "hb-private.hh" -#include "hb-object-private.hh" template diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh index fc48a91b7..95847b9cc 100644 --- a/src/hb-object-private.hh +++ b/src/hb-object-private.hh @@ -33,10 +33,6 @@ #define HB_OBJECT_PRIVATE_HH #include "hb-private.hh" -#include "hb-debug.hh" - -#include "hb-atomic-private.hh" -#include "hb-mutex-private.hh" /* reference_count */ diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index 59b8cc02b..207f6e0e2 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -30,7 +30,6 @@ #define HB_OPEN_TYPE_PRIVATE_HH #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-blob-private.hh" #include "hb-face-private.hh" diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh index ff9c5650f..21a8382c3 100644 --- a/src/hb-ot-layout-common-private.hh +++ b/src/hb-ot-layout-common-private.hh @@ -30,7 +30,6 @@ #define HB_OT_LAYOUT_COMMON_PRIVATE_HH #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-ot-layout-private.hh" #include "hb-open-type-private.hh" #include "hb-set-private.hh" diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index cbaa64880..aed00f151 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -30,7 +30,6 @@ #define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-buffer-private.hh" #include "hb-map-private.hh" #include "hb-ot-layout-gdef-table.hh" diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shape-complex-arabic.cc index 124a67f32..b1cba1c71 100644 --- a/src/hb-ot-shape-complex-arabic.cc +++ b/src/hb-ot-shape-complex-arabic.cc @@ -25,7 +25,6 @@ */ #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-ot-shape-complex-arabic-private.hh" #include "hb-ot-shape-private.hh" diff --git a/src/hb-private.hh b/src/hb-private.hh index fa9a1aee2..4201fe6ef 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -948,7 +948,11 @@ _hb_memalign(void **memptr, size_t alignment, size_t size) #endif +/* Headers we include for everyone. Specifically ordered to resolve dependencies. */ +#include "hb-debug.hh" +#include "hb-atomic-private.hh" +#include "hb-mutex-private.hh" #include "hb-dsalgs.hh" - +#include "hb-object-private.hh" #endif /* HB_PRIVATE_HH */ diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh index bdaf3f1a2..032ddb1ee 100644 --- a/src/hb-set-private.hh +++ b/src/hb-set-private.hh @@ -28,7 +28,6 @@ #define HB_SET_PRIVATE_HH #include "hb-private.hh" -#include "hb-object-private.hh" /* diff --git a/src/hb-shape-plan-private.hh b/src/hb-shape-plan-private.hh index aa0413a27..c2c4987e5 100644 --- a/src/hb-shape-plan-private.hh +++ b/src/hb-shape-plan-private.hh @@ -28,7 +28,6 @@ #define HB_SHAPE_PLAN_PRIVATE_HH #include "hb-private.hh" -#include "hb-object-private.hh" #include "hb-shaper-private.hh" diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc index 6eeba2b3d..37ff1a6e6 100644 --- a/src/hb-shape-plan.cc +++ b/src/hb-shape-plan.cc @@ -25,7 +25,6 @@ */ #include "hb-private.hh" -#include "hb-debug.hh" #include "hb-shape-plan-private.hh" #include "hb-shaper-private.hh" #include "hb-font-private.hh" diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 39c5ac4f2..74470fd1f 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -24,7 +24,6 @@ * Google Author(s): Garret Rieger, Rod Sheeter, Behdad Esfahbod */ -#include "hb-object-private.hh" #include "hb-subset-private.hh" #include "hb-set-private.hh" diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh index f4b261df0..7501294d7 100644 --- a/src/hb-subset-plan.hh +++ b/src/hb-subset-plan.hh @@ -32,7 +32,6 @@ #include "hb-subset.h" #include "hb-subset-private.hh" -#include "hb-object-private.hh" #include "hb-map-private.hh" struct hb_subset_plan_t diff --git a/src/hb-subset.cc b/src/hb-subset.cc index e86063418..a65b58d26 100644 --- a/src/hb-subset.cc +++ b/src/hb-subset.cc @@ -25,7 +25,6 @@ */ #include "hb-private.hh" -#include "hb-object-private.hh" #include "hb-open-type-private.hh" #include "hb-subset-glyf.hh" diff --git a/src/hb-unicode-private.hh b/src/hb-unicode-private.hh index 5472ece2f..b2c203d26 100644 --- a/src/hb-unicode-private.hh +++ b/src/hb-unicode-private.hh @@ -32,7 +32,6 @@ #define HB_UNICODE_PRIVATE_HH #include "hb-private.hh" -#include "hb-object-private.hh" extern HB_INTERNAL const uint8_t _hb_modified_combining_class[256]; diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc index 6d6afe80a..b17fa31ca 100644 --- a/src/hb-uniscribe.cc +++ b/src/hb-uniscribe.cc @@ -25,7 +25,6 @@ */ #include "hb-private.hh" -#include "hb-debug.hh" #define HB_SHAPER uniscribe #include "hb-shaper-impl-private.hh" diff --git a/src/hb-warning.cc b/src/hb-warning.cc index 8f322bcb1..f7a87b5ab 100644 --- a/src/hb-warning.cc +++ b/src/hb-warning.cc @@ -24,9 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#include "hb-atomic-private.hh" -#include "hb-mutex-private.hh" - +#include "hb-private.hh" #if defined(HB_ATOMIC_INT_NIL) #error "Could not find any system to define atomic_int macros, library WILL NOT be thread-safe"