diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2014-02-13 22:24:29 +1100 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2014-02-13 22:24:29 +1100 |
| commit | 4b1221d556c6a2c51ae3cee5ffe13dbf0e4dfab8 (patch) | |
| tree | ba51bfe5ed20c8c71ba3f98a7527a339bc5fe630 /apps | |
| parent | 6dbfd44b6e6a4e01066ff3a99748e586d7cd458a (diff) | |
| download | rockbox-4b1221d556c6a2c51ae3cee5ffe13dbf0e4dfab8.zip rockbox-4b1221d556c6a2c51ae3cee5ffe13dbf0e4dfab8.tar.gz rockbox-4b1221d556c6a2c51ae3cee5ffe13dbf0e4dfab8.tar.bz2 rockbox-4b1221d556c6a2c51ae3cee5ffe13dbf0e4dfab8.tar.xz | |
fix red, strtok_r being annoying on sim builds
Change-Id: Ifb884a53d801db9534dd0c5ab5921800e971963e
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugin.h | 1 | ||||
| -rw-r--r-- | apps/plugins/main_menu_config.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/plugin.h b/apps/plugin.h index 0e05805..764af4a 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -45,6 +45,7 @@ #undef strcmp #undef strncmp #undef strchr +#undef strtok_r char* strncpy(char *, const char *, size_t); void* plugin_get_buffer(size_t *buffer_size); diff --git a/apps/plugins/main_menu_config.c b/apps/plugins/main_menu_config.c index da9fde8..554265a 100644 --- a/apps/plugins/main_menu_config.c +++ b/apps/plugins/main_menu_config.c @@ -62,7 +62,7 @@ void load_from_cfg(void) rb->root_menu_write_to_cfg(NULL, config_str, sizeof(config_str)); - token = strtok_r(config_str, ", ", &save); + token = rb->strtok_r(config_str, ", ", &save); while (token) { @@ -78,7 +78,7 @@ void load_from_cfg(void) menu_items[done].enabled = true; done++; } - token = strtok_r(NULL, ", ", &save); + token = rb->strtok_r(NULL, ", ", &save); } if (done < menu_item_count) |