From: Oleg Oshmyan <chortos@inbox.lv>
Date: Sun, 27 Apr 2014 05:48:47 +0000 (+0100)
Subject: Move ASS_Shaper declaration to ass_shaper.h
X-Git-Tag: 0.13.0~5^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b86ddcaab63429c7ba52ca0db4745d11cb79b8e;p=libass

Move ASS_Shaper declaration to ass_shaper.h
---

diff --git a/libass/ass_render.h b/libass/ass_render.h
index b664c79..194c906 100644
--- a/libass/ass_render.h
+++ b/libass/ass_render.h
@@ -30,9 +30,6 @@
 #include "hb.h"
 #endif
 
-// XXX: fix the inclusion mess so we can avoid doing this here
-typedef struct ass_shaper ASS_Shaper;
-
 #include "ass.h"
 #include "ass_font.h"
 #include "ass_bitmap.h"
@@ -291,6 +288,8 @@ typedef struct {
     size_t composite_max_size;
 } CacheStore;
 
+#include "ass_shaper.h"
+
 struct ass_renderer {
     ASS_Library *library;
     FT_Library ftlibrary;
diff --git a/libass/ass_shaper.h b/libass/ass_shaper.h
index e6121d1..b27cd53 100644
--- a/libass/ass_shaper.h
+++ b/libass/ass_shaper.h
@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+typedef struct ass_shaper ASS_Shaper;
+
 #include <fribidi.h>
 #include "ass_render.h"