Move ASS_Shaper declaration to ass_shaper.h

diff --git a/libass/ass_render.h b/libass/ass_render.h
index b664c791257053e958ec434e32b4a50d833e7a23..194c90685f68e37d293c1ae3a593ed4c700bfba4 100644 (file)
--- 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 e6121d137aa376225a42e34327f014739b09136e..b27cd53b2253c82d2d8401c7f9ac19e00ba2dabf 100644 (file)
--- 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"