From 65fdcddec6c616bf0e1d3ee39bca242c05094410 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Fri, 6 Sep 2013 21:32:22 +0200 Subject: Hack-fix build with different system/core/charger versions Signed-off-by: Vojtech Bocek --- minui/graphics.c | 7 ++++++- minui/minui.h | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/minui/graphics.c b/minui/graphics.c index 4968eac7a..9ee77b3aa 100644 --- a/minui/graphics.c +++ b/minui/graphics.c @@ -223,7 +223,12 @@ void gr_font_size(int *x, int *y) *y = gr_font->cheight; } -int gr_text(int x, int y, const char *s, int bold) +int gr_text(int x, int y, const char *s, ...) +{ + return gr_text_impl(x, y, s, 0); +} + +int gr_text_impl(int x, int y, const char *s, int bold) { GGLContext *gl = gr_context; GRFont *font = gr_font; diff --git a/minui/minui.h b/minui/minui.h index 1b8dd059b..ccd501f85 100644 --- a/minui/minui.h +++ b/minui/minui.h @@ -37,7 +37,12 @@ void gr_fb_blank(bool blank); void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a); void gr_fill(int x1, int y1, int x2, int y2); -int gr_text(int x, int y, const char *s, int bold); + +// system/core/charger uses different gr_print signatures in diferent +// Android versions, either with or without int bold. +int gr_text(int x, int y, const char *s, ...); +int gr_text_impl(int x, int y, const char *s, int bold); + void gr_texticon(int x, int y, gr_surface icon); int gr_measure(const char *s); void gr_font_size(int *x, int *y); -- cgit v1.2.3