Fix warnings

This commit is contained in:
RichardG867
2020-11-18 19:59:51 -03:00
parent 85a35e0841
commit fd08b2fdf1
3 changed files with 4 additions and 4 deletions

View File

@@ -320,7 +320,7 @@ cpu_get_family(const char *internal_name)
int c = 0; int c = 0;
while (cpu_families[c].package) { while (cpu_families[c].package) {
if (!strcmp(internal_name, cpu_families[c].internal_name)) if (!strcmp(internal_name, cpu_families[c].internal_name))
return &cpu_families[c]; return (cpu_family_t *) &cpu_families[c];
c++; c++;
} }

View File

@@ -1858,5 +1858,5 @@ const cpu_legacy_machine_t cpu_legacy_table[] = {
{"p6bap", cputables_Celeron_Cyrix3}, {"p6bap", cputables_Celeron_Cyrix3},
{"603tcf", cputables_Celeron_Cyrix3}, {"603tcf", cputables_Celeron_Cyrix3},
{"vpc2007", cputables_PentiumIID_Celeron}, {"vpc2007", cputables_PentiumIID_Celeron},
{NULL, {NULL}} {NULL, NULL}
}; };

View File

@@ -769,7 +769,7 @@ win_settings_machine_recalc_machine(HWND hdlg)
fatal("No eligible CPU families for the selected machine\n"); fatal("No eligible CPU families for the selected machine\n");
settings_enable_window(hdlg, IDC_COMBO_CPU_TYPE, TRUE); settings_enable_window(hdlg, IDC_COMBO_CPU_TYPE, TRUE);
if (current_eligible == -1) { if (current_eligible == -1) {
temp_cpu_f = &cpu_families[listtocpufamily[0]]; temp_cpu_f = (cpu_family_t *) &cpu_families[listtocpufamily[0]];
settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, 0); settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, 0);
} else { } else {
settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, current_eligible); settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, current_eligible);
@@ -937,7 +937,7 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
case IDC_COMBO_CPU_TYPE: case IDC_COMBO_CPU_TYPE:
if (HIWORD(wParam) == CBN_SELCHANGE) { if (HIWORD(wParam) == CBN_SELCHANGE) {
temp_cpu_f = &cpu_families[listtocpufamily[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_TYPE)]]; temp_cpu_f = (cpu_family_t *) &cpu_families[listtocpufamily[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_TYPE)]];
temp_cpu = 0; temp_cpu = 0;
win_settings_machine_recalc_cpu_m(hdlg); win_settings_machine_recalc_cpu_m(hdlg);
} }