# HG changeset patch # User Darkvater # Date 1155634107 0 # Node ID 3265e76b70164540696574b5e83ffd44ce9f8a41 # Parent 13a8344e4ac4da77676eee0a3b84d1144a7f68be (svn r5910) Fix some more warnings on MSVC by using (void*) casts. Followup of r5907. diff -r 13a8344e4ac4 -r 3265e76b7016 aircraft_gui.c --- a/aircraft_gui.c Tue Aug 15 09:03:35 2006 +0000 +++ b/aircraft_gui.c Tue Aug 15 09:28:27 2006 +0000 @@ -1142,7 +1142,7 @@ break; case WE_DESTROY: - free(vl->sort_list); + free((void*)vl->sort_list); break; case WE_TICK: /* resort the list every 20 seconds orso (10 days) */ diff -r 13a8344e4ac4 -r 3265e76b7016 roadveh_gui.c --- a/roadveh_gui.c Tue Aug 15 09:03:35 2006 +0000 +++ b/roadveh_gui.c Tue Aug 15 09:28:27 2006 +0000 @@ -1078,7 +1078,7 @@ break; case WE_DESTROY: - free(vl->sort_list); + free((void*)vl->sort_list); break; case WE_TICK: /* resort the list every 20 seconds orso (10 days) */ diff -r 13a8344e4ac4 -r 3265e76b7016 ship_gui.c --- a/ship_gui.c Tue Aug 15 09:03:35 2006 +0000 +++ b/ship_gui.c Tue Aug 15 09:28:27 2006 +0000 @@ -1090,7 +1090,7 @@ break; case WE_DESTROY: - free(vl->sort_list); + free((void*)vl->sort_list); break; case WE_TICK: /* resort the list every 20 seconds orso (10 days) */ diff -r 13a8344e4ac4 -r 3265e76b7016 station_gui.c --- a/station_gui.c Tue Aug 15 09:03:35 2006 +0000 +++ b/station_gui.c Tue Aug 15 09:28:27 2006 +0000 @@ -232,7 +232,7 @@ _internal_sort_order = sl->flags & SL_ORDER; _last_station = NULL; // used for "cache" in namesorting - qsort(sl->sort_list, sl->list_length, sizeof(sl->sort_list[0]), _station_sorter[sl->sort_type]); + qsort((void*)sl->sort_list, sl->list_length, sizeof(sl->sort_list[0]), _station_sorter[sl->sort_type]); sl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; sl->flags &= ~SL_RESORT; diff -r 13a8344e4ac4 -r 3265e76b7016 train_gui.c --- a/train_gui.c Tue Aug 15 09:03:35 2006 +0000 +++ b/train_gui.c Tue Aug 15 09:28:27 2006 +0000 @@ -1539,7 +1539,7 @@ break; case WE_DESTROY: - free(vl->sort_list); + free((void*)vl->sort_list); break; case WE_TICK: /* resort the list every 20 seconds orso (10 days) */ diff -r 13a8344e4ac4 -r 3265e76b7016 vehicle_gui.c --- a/vehicle_gui.c Tue Aug 15 09:03:35 2006 +0000 +++ b/vehicle_gui.c Tue Aug 15 09:28:27 2006 +0000 @@ -182,7 +182,7 @@ _internal_sort_order = vl->flags & VL_DESC; _internal_name_sorter_id = STR_SV_TRAIN_NAME; _last_vehicle = NULL; // used for "cache" in namesorting - qsort(vl->sort_list, vl->list_length, sizeof(vl->sort_list[0]), + qsort((void*)vl->sort_list, vl->list_length, sizeof(vl->sort_list[0]), _vehicle_sorter[vl->sort_type]); vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;