From: Werner Lemberg <wl@gnu.org>
Date: Wed, 11 Dec 2013 06:53:14 +0000 (+0100)
Subject: Include `freetype.hh' where appropriate.
X-Git-Tag: release/2.19.0-1~50
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=29ccdc51ecd659ed69737591cac7f7018cf31bec;p=lilypond.git

Include `freetype.hh' where appropriate.

This ensures that we aren't dependent on indirect header inclusion chains of
third-party packages.
---

diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh
index 14f14d92c0..89104bc888 100644
--- a/lily/include/freetype.hh
+++ b/lily/include/freetype.hh
@@ -20,6 +20,7 @@
 #ifndef FREETYPE_HH
 #define FREETYPE_HH
 
+// This include file loads the header file macros for FreeType.
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 837a1f2300..76bbff86ed 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -18,6 +18,7 @@
 */
 
 #include "open-type-font.hh"
+#include "freetype.hh"
 
 #include <cstdio>
 
diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index b148a5bc08..e7b5489df5 100644
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -22,6 +22,7 @@
 #define PANGO_ENABLE_BACKEND
 
 #include <pango/pangoft2.h>
+#include "freetype.hh"
 #include FT_XFREE86_H
 
 #include <map>