From 8501c404f6097cf324441de98f6790b07e70c0a1 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Fri, 14 Dec 2012 22:33:04 +0100
Subject: [PATCH] Fix CXX_BUILD.

---
 gfx/fonts/fonts.c | 2 +-
 gfx/fonts/fonts.h | 2 +-
 gfx/gl_common.h   | 2 +-
 gfx/sdl_gfx.c     | 2 +-
 gfx/xvideo.c      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gfx/fonts/fonts.c b/gfx/fonts/fonts.c
index e027d7038b..65214f055b 100644
--- a/gfx/fonts/fonts.c
+++ b/gfx/fonts/fonts.c
@@ -27,7 +27,7 @@ static const font_renderer_driver_t *backends[] = {
    &bitmap_font_renderer,
 };
 
-bool font_renderer_create_default(const font_renderer_driver_t **driver, font_renderer_t **handle)
+bool font_renderer_create_default(const font_renderer_driver_t **driver, void **handle)
 {
    for (unsigned i = 0; i < ARRAY_SIZE(backends); i++)
    {
diff --git a/gfx/fonts/fonts.h b/gfx/fonts/fonts.h
index 6fe9c90855..2806af0b10 100644
--- a/gfx/fonts/fonts.h
+++ b/gfx/fonts/fonts.h
@@ -49,7 +49,7 @@ typedef struct font_renderer_driver
 extern const font_renderer_driver_t ft_font_renderer;
 extern const font_renderer_driver_t bitmap_font_renderer;
 
-bool font_renderer_create_default(const font_renderer_driver_t **driver, font_renderer_t **handle);
+bool font_renderer_create_default(const font_renderer_driver_t **driver, void **handle);
 
 #endif
 
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index c0729b536b..447c742f42 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -265,7 +265,7 @@ typedef struct gl
    unsigned base_size; // 2 or 4
 
    // Fonts
-   font_renderer_t *font;
+   void *font;
    const font_renderer_driver_t *font_driver;
    GLuint font_tex;
    int font_tex_w, font_tex_h;
diff --git a/gfx/sdl_gfx.c b/gfx/sdl_gfx.c
index c981565e2b..b5ad949f2d 100644
--- a/gfx/sdl_gfx.c
+++ b/gfx/sdl_gfx.c
@@ -40,7 +40,7 @@ typedef struct sdl_video
    SDL_Surface *screen;
    bool quitting;
 
-   font_renderer_t *font;
+   void *font;
    const font_renderer_driver_t *font_driver;
    uint8_t font_r;
    uint8_t font_g;
diff --git a/gfx/xvideo.c b/gfx/xvideo.c
index a16f7d7e2f..0eff5cc207 100644
--- a/gfx/xvideo.c
+++ b/gfx/xvideo.c
@@ -62,7 +62,7 @@ typedef struct xv
    uint8_t *utable;
    uint8_t *vtable;
 
-   font_renderer_t *font;
+   void *font;
    const font_renderer_driver_t *font_driver;
 
    unsigned luma_index[2];