diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-06-02 18:57:22 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-06-02 18:57:22 +1000 |
| commit | 1c258a82738e145953fc9cf40c68dcce6db87d92 (patch) | |
| tree | c151e882619714d696276ce29ef3388dce6e1866 /src/gwin | |
| parent | c2a4f9a5d616f5b18a965652d7492aacd377e5e2 (diff) | |
| download | uGFX-1c258a82738e145953fc9cf40c68dcce6db87d92.tar.gz uGFX-1c258a82738e145953fc9cf40c68dcce6db87d92.tar.bz2 uGFX-1c258a82738e145953fc9cf40c68dcce6db87d92.zip | |
GOS updates
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/console.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gwin/console.c b/src/gwin/console.c index 32e4f35a..5c068c93 100644 --- a/src/gwin/console.c +++ b/src/gwin/console.c @@ -63,7 +63,7 @@ GHandle gwinCreateConsole(GConsoleObject *gc, coord_t x, coord_t y, coord_t widt return 0; gc->gwin.type = GW_CONSOLE; gwinSetFont(&gc->gwin, font); - #if GFX_USE_OS_CHIBIOS + #if GFX_USE_OS_CHIBIOS && GWIN_CONSOLE_USE_BASESTREAM gc->stream.vmt = &GWindowConsoleVMT; #endif gc->cx = 0; @@ -193,7 +193,7 @@ void gwinPrintf(GHandle gh, const char *fmt, ...) { int i, precision, width; bool_t is_long, left_align; long l; - #if CHPRINTF_USE_FLOAT + #if GWIN_CONSOLE_USE_FLOAT float f; char tmpbuf[2*MAX_FILLER + 1]; #else @@ -286,7 +286,7 @@ void gwinPrintf(GHandle gh, const char *fmt, ...) { } p = ltoa_wd(p, l, 10, 0); break; - #if CHPRINTF_USE_FLOAT + #if GWIN_CONSOLE_USE_FLOAT case 'f': f = (float) va_arg(ap, double); if (f < 0) { |