summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2018-08-25 22:36:36 -0700
committerBehdad Esfahbod <behdad@behdad.org>2018-08-25 22:36:36 -0700
commitc77ae40852aabb1698da9e8d488f75bae2f4e734 (patch)
tree4aeed5468a81460bff9adbfd7165faa657a486f7 /util
parent82b12bcadd50c9e86bbe82623a1cbc0b4afdd237 (diff)
Rename hb-*private.hh to hb-*.hh
Sorry for the noise, downstream custom builders. Please adjust.
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.am4
-rw-r--r--util/ansi-print.hh3
-rw-r--r--util/hb-subset.cc2
-rw-r--r--util/helper-cairo-ansi.hh2
-rw-r--r--util/helper-cairo.hh2
-rw-r--r--util/main-font-text.hh2
-rw-r--r--util/options.hh2
-rw-r--r--util/shape-consumer.hh2
-rw-r--r--util/view-cairo.hh2
9 files changed, 11 insertions, 10 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index d4ab9cdc..b8bf8841 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -47,7 +47,9 @@ hb_shape_SOURCES = $(HB_SHAPE_sources)
bin_PROGRAMS += hb-shape
hb_subset_SOURCES = $(HB_SUBSET_CLI_sources)
-hb_subset_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
+hb_subset_LDADD = \
+ $(LDADD) \
+ $(top_builddir)/src/libharfbuzz-subset.la
bin_PROGRAMS += hb-subset
if HAVE_OT
diff --git a/util/ansi-print.hh b/util/ansi-print.hh
index 1ea5b374..9640d892 100644
--- a/util/ansi-print.hh
+++ b/util/ansi-print.hh
@@ -27,8 +27,7 @@
#ifndef ANSI_PRINT_HH
#define ANSI_PRINT_HH
-#include "hb-private.hh"
-#include <hb.h> /* for int types */
+#include "hb.hh"
void
ansi_print_image_rgb24 (const uint32_t *data,
diff --git a/util/hb-subset.cc b/util/hb-subset.cc
index 20617554..a15495fa 100644
--- a/util/hb-subset.cc
+++ b/util/hb-subset.cc
@@ -29,7 +29,7 @@
#include "main-font-text.hh"
#include "hb-subset.h"
-#include "hb-subset-private.hh"
+#include "hb-subset.hh" /* XXX */
/*
* Command line interface to the harfbuzz font subsetter.
diff --git a/util/helper-cairo-ansi.hh b/util/helper-cairo-ansi.hh
index cf18ea49..bc231321 100644
--- a/util/helper-cairo-ansi.hh
+++ b/util/helper-cairo-ansi.hh
@@ -27,7 +27,7 @@
#ifndef HELPER_CAIRO_ANSI_HH
#define HELPER_CAIRO_ANSI_HH
-#include "hb-private.hh"
+#include "hb.hh"
#include <cairo.h>
diff --git a/util/helper-cairo.hh b/util/helper-cairo.hh
index 50bc0af0..1613ce42 100644
--- a/util/helper-cairo.hh
+++ b/util/helper-cairo.hh
@@ -27,7 +27,7 @@
#ifndef HELPER_CAIRO_HH
#define HELPER_CAIRO_HH
-#include "hb-private.hh"
+#include "hb.hh"
#include "options.hh"
#include <cairo.h>
diff --git a/util/main-font-text.hh b/util/main-font-text.hh
index 3390371c..01bd2d4d 100644
--- a/util/main-font-text.hh
+++ b/util/main-font-text.hh
@@ -27,7 +27,7 @@
#ifndef HB_MAIN_FONT_TEXT_HH
#define HB_MAIN_FONT_TEXT_HH
-#include "hb-private.hh"
+#include "hb.hh"
#include "options.hh"
/* main() body for utilities taking font and processing text.*/
diff --git a/util/options.hh b/util/options.hh
index 2160d5ec..34579094 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -27,7 +27,7 @@
#ifndef OPTIONS_HH
#define OPTIONS_HH
-#include "hb-private.hh"
+#include "hb.hh"
#include <stdlib.h>
#include <stddef.h>
diff --git a/util/shape-consumer.hh b/util/shape-consumer.hh
index fa419f18..da0d8803 100644
--- a/util/shape-consumer.hh
+++ b/util/shape-consumer.hh
@@ -27,7 +27,7 @@
#ifndef HB_SHAPE_CONSUMER_HH
#define HB_SHAPE_CONSUMER_HH
-#include "hb-private.hh"
+#include "hb.hh"
#include "options.hh"
diff --git a/util/view-cairo.hh b/util/view-cairo.hh
index 00df68c2..677f74b3 100644
--- a/util/view-cairo.hh
+++ b/util/view-cairo.hh
@@ -27,7 +27,7 @@
#ifndef VIEW_CAIRO_HH
#define VIEW_CAIRO_HH
-#include "hb-private.hh"
+#include "hb.hh"
#include "options.hh"
#include "helper-cairo.hh"