summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2023-09-22 09:57:48 -0400
committerSolomon Peachy <pizza@shaftnet.org>2023-09-22 10:00:46 -0400
commit8cc3266b2a172a51dc12d05e8e1a06485b895e48 (patch)
treef45e7c9e273037d2f4ea0c72b740c4241458eeb2 /apps/settings.c
parentcb3a6877fcbb001a8ee9afd3e4a25579ac40f805 (diff)
downloadrockbox-8cc3266b2a172a51dc12d05e8e1a06485b895e48.tar.gz
rockbox-8cc3266b2a172a51dc12d05e8e1a06485b895e48.zip
Settings: Rename INT/BOOL setting type enum to RB_INT/RB_BOOL
....Because INT and BOOL are already defined in mingw32. Change-Id: I28ab8189c00002c8f68bc9d0c23d2ae78d9e33d0
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 8cfd4afec3..b281646686 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1201,7 +1201,7 @@ bool set_bool_options(const char* string, const bool* variable,
1201 }; 1201 };
1202 bool result; 1202 bool result;
1203 1203
1204 result = set_option(string, variable, BOOL, names, 2, 1204 result = set_option(string, variable, RB_BOOL, names, 2,
1205 (void (*)(int))(void (*)(void))function); 1205 (void (*)(int))(void (*)(void))function);
1206 return result; 1206 return result;
1207} 1207}
@@ -1286,13 +1286,13 @@ bool set_option(const char* string, const void* variable, enum optiontype type,
1286 item.lang_id = -1; 1286 item.lang_id = -1;
1287 item.cfg_vals = (char*)string; 1287 item.cfg_vals = (char*)string;
1288 item.setting = &temp; 1288 item.setting = &temp;
1289 if (type == BOOL) 1289 if (type == RB_BOOL)
1290 temp = *(bool*)variable? 1: 0; 1290 temp = *(bool*)variable? 1: 0;
1291 else 1291 else
1292 temp = *(int*)variable; 1292 temp = *(int*)variable;
1293 if (!option_screen(&item, NULL, false, NULL)) 1293 if (!option_screen(&item, NULL, false, NULL))
1294 { 1294 {
1295 if (type == BOOL) 1295 if (type == RB_BOOL)
1296 1296
1297 *(bool*)variable = (temp == 1); 1297 *(bool*)variable = (temp == 1);
1298 else 1298 else