From 7803f31c531c75c75d57513caa14caa934edcf19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= Date: Mon, 7 May 2012 18:27:46 +0200 Subject: Don't reinvent ctype.h functions Remove ctype.h functions in text_editor and rockboy, fix #define name clash in mpegplayer. Change-Id: Icb40cf45e27b793c62cb095197757a27f508f344 --- apps/plugins/text_editor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'apps/plugins/text_editor.c') diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index 32013b6..6c1136c 100644 --- a/apps/plugins/text_editor.c +++ b/apps/plugins/text_editor.c @@ -287,12 +287,10 @@ static int do_item_menu(int cur_sel) } #ifdef HAVE_LCD_COLOR -/* in misc.h but no need to polute the api */ -#define toupper(c) (((c >= 'a') && (c <= 'z'))?c+'A':c) -#define isxdigit(c) ((c>='a' && c<= 'f') || (c>='A' && c<= 'F') \ - || (c>='0' && c<= '9')) + #define hex2dec(c) (((c) >= '0' && ((c) <= '9')) ? (toupper(c)) - '0' : \ (toupper(c)) - 'A' + 10) + static int my_hex_to_rgb(const char* hex, int* color) { int ok = 1; int i; -- cgit v1.1