From f45867d1cd480b150cfd5ab3064608a1e38cc862 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 5 Dec 2015 18:56:37 +0100 Subject: [PATCH] More CXX_BUILD fixes --- gfx/font_driver.c | 6 +++--- gfx/font_driver.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gfx/font_driver.c b/gfx/font_driver.c index 6ed1a5e6bb..e8594a2dbf 100644 --- a/gfx/font_driver.c +++ b/gfx/font_driver.c @@ -264,7 +264,7 @@ void font_driver_free(void *data) font_osd_driver = NULL; } -bool font_driver_init_first(const void **font_driver, void *font_handle, +bool font_driver_init_first(const void **font_driver, void **font_handle, void *data, const char *font_path, float font_size, bool threading_hint, enum font_driver_render_api api) @@ -274,8 +274,8 @@ bool font_driver_init_first(const void **font_driver, void *font_handle, (const struct retro_hw_render_callback*)video_driver_callback(); const void **new_font_driver = font_driver ? font_driver : (const void**)&font_osd_driver; - void *new_font_handle = font_handle ? font_handle - : &font_osd_data; + void **new_font_handle = font_handle ? font_handle + : (void**)&font_osd_data; if (threading_hint && settings->video.threaded && !hw_render->context_type) { diff --git a/gfx/font_driver.h b/gfx/font_driver.h index 90f3e95ead..9ae604767a 100644 --- a/gfx/font_driver.h +++ b/gfx/font_driver.h @@ -146,7 +146,7 @@ void font_driver_flush(void *data); void font_driver_free(void *data); -bool font_driver_init_first(const void **font_driver, void *font_handle, +bool font_driver_init_first(const void **font_driver, void **font_handle, void *data, const char *font_path, float font_size, bool threading_hint, enum font_driver_render_api api);