From 8ca892b0e223767ae67cdc3d3edd1fac49eb36c4 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 11 Mar 2025 00:19:34 -0600 Subject: [PATCH] [directwrite] Simplify headers --- meson.build | 2 +- src/hb-directwrite.cc | 3 --- src/hb-directwrite.h | 2 +- test/api/test-directwrite.cc | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 2aa816ea7..a93d723c2 100644 --- a/meson.build +++ b/meson.build @@ -335,7 +335,7 @@ endif # DirectWrite (Windows) directwrite_dep = [] if host_machine.system() == 'windows' and not get_option('directwrite').disabled() - if get_option('directwrite').enabled() and not cpp.has_header('dwrite_1.h') + if get_option('directwrite').enabled() and not cpp.has_header('dwrite_3.h') error('DirectWrite was enabled explicitly, but required header is missing.') endif directwrite_dep = cpp.find_library('dwrite', required: false) diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc index f138bd4f3..ddd765a84 100644 --- a/src/hb-directwrite.cc +++ b/src/hb-directwrite.cc @@ -28,9 +28,6 @@ #include "hb-shaper-impl.hh" -#include -#include - #include "hb-directwrite.h" #include "hb-ms-feature-ranges.hh" diff --git a/src/hb-directwrite.h b/src/hb-directwrite.h index 1735e80fd..b5b314e16 100644 --- a/src/hb-directwrite.h +++ b/src/hb-directwrite.h @@ -27,7 +27,7 @@ #include "hb.h" -#include +#include HB_BEGIN_DECLS diff --git a/test/api/test-directwrite.cc b/test/api/test-directwrite.cc index 345b9d2a9..c48572192 100644 --- a/test/api/test-directwrite.cc +++ b/test/api/test-directwrite.cc @@ -25,8 +25,6 @@ */ -#include - #include "hb-test.h" #include "hb-directwrite.h"