aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin/console.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-02-03 18:23:53 +1000
committerinmarket <andrewh@inmarket.com.au>2014-02-03 18:23:53 +1000
commitf26581dc7e85f77393143a44c0c3eb3eef0da8b4 (patch)
tree9a83c5eaf1abe2cc61b216012f997e6891840a19 /src/gwin/console.c
parentb6daaabf32bf2092689e0732ca4486f25e80317f (diff)
parentd869d9b3b80cb9ab2314840b2fa274e89e5342db (diff)
downloaduGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.gz
uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.bz2
uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.zip
Merge branch 'master' into freertos
Diffstat (limited to 'src/gwin/console.c')
-rw-r--r--src/gwin/console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gwin/console.c b/src/gwin/console.c
index ef374220..623404be 100644
--- a/src/gwin/console.c
+++ b/src/gwin/console.c
@@ -285,7 +285,7 @@ GHandle gwinGConsoleCreate(GDisplay *g, GConsoleObject *gc, const GWindowInit *p
gcw->bufsize *= gh->height / gdispGetFontMetric(gh->font, fontHeight);
// Allocate the buffer
- if (!(gcw->buffer = (char*)gfxAlloc(gcw->bufsize)))
+ if (!(gcw->buffer = gfxAlloc(gcw->bufsize)))
return FALSE;
// All good!