1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
|
From: Damjan Georgievski <gdamjan@gmail.com>
Date: Mon, 6 Jan 2014 03:06:18 +0100
Subject: Fix #includes for recent freetype versions
---
fbsplash/ttf.c | 5 -----
fbsplash/ttf.h | 3 +--
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/fbsplash/ttf.c b/fbsplash/ttf.c
index 384f400..49ce7fd 100644
--- a/fbsplash/ttf.c
+++ b/fbsplash/ttf.c
@@ -25,11 +25,6 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-
-#include <ft2build.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
-
#include "splash.h"
TTF_Font *global_font;
diff --git a/fbsplash/ttf.h b/fbsplash/ttf.h
index 034bb9e..1d9736c 100644
--- a/fbsplash/ttf.h
+++ b/fbsplash/ttf.h
@@ -1,8 +1,7 @@
#ifndef _TTF_H
#define _TTF_H
#include <ft2build.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
+#include FT_OUTLINE_H
#define CACHED_METRICS 0x10
#define CACHED_BITMAP 0x01
|