From f7eca0095791b19e6c767ce24fd4261f864079eb Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 20 Dec 2011 21:40:35 +0100 Subject: [PATCH] console: remove cairo from header There is no reason to make all tests/* apps need cairo dependencies. We pass this parameter internally so we can safely use void*. Signed-off-by: David Herrmann --- src/console.h | 3 +-- src/console_char.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/console.h b/src/console.h index 71b500c..a992a71 100644 --- a/src/console.h +++ b/src/console.h @@ -35,7 +35,6 @@ * of it. */ -#include #include #include @@ -65,7 +64,7 @@ void kmscon_font_ref(struct kmscon_font *font); void kmscon_font_unref(struct kmscon_font *font); int kmscon_font_draw(struct kmscon_font *font, const struct kmscon_char *ch, - cairo_t *cr, uint32_t x, uint32_t y); + void *dcr, uint32_t x, uint32_t y); /* console buffer with cell objects */ diff --git a/src/console_char.c b/src/console_char.c index b84922a..a4d400e 100644 --- a/src/console_char.c +++ b/src/console_char.c @@ -576,10 +576,11 @@ err_char: * Returns 0 on success. */ int kmscon_font_draw(struct kmscon_font *font, const struct kmscon_char *ch, - cairo_t *cr, uint32_t x, uint32_t y) + void *dcr, uint32_t x, uint32_t y) { struct kmscon_glyph *glyph; int ret; + cairo_t *cr = dcr; if (!font || !ch || !cr) return -EINVAL;