aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin/gwin_console.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-06-08 14:14:40 +1000
committerinmarket <andrewh@inmarket.com.au>2015-06-08 14:14:40 +1000
commitccde54722f2c284fb0e7fc273d65c57a3be71db1 (patch)
treefffa49870c73d7e9d5caaf5c6d1d47cf0e5c90d3 /src/gwin/gwin_console.c
parente850c344b818f21a2ec286f9c4a149a9cd4ac34b (diff)
downloaduGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.tar.gz
uGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.tar.bz2
uGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.zip
Added ability to compile ugfx as a single file (excluding driver and board files).
Simply compile src/gfx_mk.c
Diffstat (limited to 'src/gwin/gwin_console.c')
-rw-r--r--src/gwin/gwin_console.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gwin/gwin_console.c b/src/gwin/gwin_console.c
index 11359626..e1aed23d 100644
--- a/src/gwin/gwin_console.c
+++ b/src/gwin/gwin_console.c
@@ -611,7 +611,7 @@ void gwinPutCharArray(GHandle gh, const char *str, size_t n) {
#define MAX_FILLER 11
#define FLOAT_PRECISION 100000
-static char *ltoa_wd(char *p, long num, unsigned radix, long divisor) {
+static char *consltoa_wd(char *p, long num, unsigned radix, long divisor) {
int i;
char *q;
@@ -641,10 +641,10 @@ static char *ltoa_wd(char *p, long num, unsigned radix, long divisor) {
unsigned long precision = FLOAT_PRECISION;
l = num;
- p = ltoa_wd(p, l, 10, 0);
+ p = consltoa_wd(p, l, 10, 0);
*p++ = '.';
l = (num - l) * precision;
- return ltoa_wd(p, l, 10, precision / 10);
+ return consltoa_wd(p, l, 10, precision / 10);
}
#endif
@@ -746,7 +746,7 @@ void gwinPrintf(GHandle gh, const char *fmt, ...) {
*p++ = '-';
l = -l;
}
- p = ltoa_wd(p, l, 10, 0);
+ p = consltoa_wd(p, l, 10, 0);
break;
#if GWIN_CONSOLE_USE_FLOAT
case 'f':
@@ -774,7 +774,7 @@ void gwinPrintf(GHandle gh, const char *fmt, ...) {
l = va_arg(ap, long);
else
l = va_arg(ap, int);
- p = ltoa_wd(p, l, c, 0);
+ p = consltoa_wd(p, l, c, 0);
break;
default:
*p++ = c;