summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-06-07 09:12:23 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-06-07 09:12:23 +0000
commit930447c9301a5693b8c71178f7ef377f8cee106d (patch)
tree7dec897d2838933339aa94b9f85685bded5db7f4
parentae49b387bfe78250808a98565f6a233f22045f12 (diff)
downloadrockbox-930447c9301a5693b8c71178f7ef377f8cee106d.tar.gz
rockbox-930447c9301a5693b8c71178f7ef377f8cee106d.tar.bz2
rockbox-930447c9301a5693b8c71178f7ef377f8cee106d.zip
oops, missed to failed hunks in the patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17699 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/misc.c2
-rw-r--r--apps/misc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/misc.c b/apps/misc.c
index 65688024cc..bca66dcb54 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -1232,7 +1232,7 @@ int hex_to_rgb(const char* hex, int* color)
/* '0'-'3' are ASCII 0x30 to 0x33 */
#define is0123(x) (((x) & 0xfc) == 0x30)
-const char* parse_list(const char *fmt, unsigned int *set_vals,
+const char* parse_list(const char *fmt, uint32_t *set_vals,
const char sep, const char* str, ...)
{
va_list ap;
diff --git a/apps/misc.h b/apps/misc.h
index d0edb3dcd1..8394a6396a 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -136,7 +136,7 @@ char *strip_extension(char* buffer, int buffer_size, const char *filename);
* - valid_vals: value after the call to 'parse_list'
*/
#define LIST_VALUE_PARSED(setvals, position) ((setvals)&(1<<(position)))
-const char* parse_list(const char *fmt, unsigned int *set_vals,
+const char* parse_list(const char *fmt, uint32_t *set_vals,
const char sep, const char* str, ...);
#endif /* MISC_H */