diff options
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/settings.h b/apps/settings.h index 9f9cc63602..6c675463f1 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -139,7 +139,7 @@ extern unsigned char vp_dummy[VIRT_SIZE]; | |||
139 | #define ID2P(id) (VIRT_PTR + id) | 139 | #define ID2P(id) (VIRT_PTR + id) |
140 | 140 | ||
141 | /* resolve a pointer which could be a virtualized ID or a literal */ | 141 | /* resolve a pointer which could be a virtualized ID or a literal */ |
142 | #define P2STR(p) ((p>=VIRT_PTR && p<=VIRT_PTR+VIRT_SIZE) ? str(p-VIRT_PTR) : p) | 142 | #define P2STR(p) (char *)((p>=VIRT_PTR && p<=VIRT_PTR+VIRT_SIZE) ? str(p-VIRT_PTR) : p) |
143 | 143 | ||
144 | /* get the string ID from a virtual pointer, -1 if not virtual */ | 144 | /* get the string ID from a virtual pointer, -1 if not virtual */ |
145 | #define P2ID(p) ((p>=VIRT_PTR && p<=VIRT_PTR+VIRT_SIZE) ? p-VIRT_PTR : -1) | 145 | #define P2ID(p) ((p>=VIRT_PTR && p<=VIRT_PTR+VIRT_SIZE) ? p-VIRT_PTR : -1) |
@@ -403,7 +403,8 @@ bool set_bool_options(const char* string, bool* variable, | |||
403 | bool set_bool(const char* string, bool* variable ); | 403 | bool set_bool(const char* string, bool* variable ); |
404 | bool set_option(const char* string, void* variable, enum optiontype type, | 404 | bool set_option(const char* string, void* variable, enum optiontype type, |
405 | const struct opt_items* options, int numoptions, void (*function)(int)); | 405 | const struct opt_items* options, int numoptions, void (*function)(int)); |
406 | bool set_int(const char* string, const char* unit, int voice_unit, int* variable, | 406 | bool set_int(const unsigned char* string, const char* unit, int voice_unit, |
407 | int* variable, | ||
407 | void (*function)(int), int step, int min, int max, | 408 | void (*function)(int), int step, int min, int max, |
408 | void (*formatter)(char*, int, int, const char*) ); | 409 | void (*formatter)(char*, int, int, const char*) ); |
409 | bool set_time_screen(const char* string, struct tm *tm); | 410 | bool set_time_screen(const char* string, struct tm *tm); |