changeset 4280:6d168a3986e1 draft

(svn r5910) Fix some more warnings on MSVC by using (void*) casts. Followup of r5907.
author Darkvater <Darkvater@openttd.org>
date Tue, 15 Aug 2006 09:28:27 +0000
parents 41f710dfab62
children 2f37e6ffd454
files aircraft_gui.c roadveh_gui.c ship_gui.c station_gui.c train_gui.c vehicle_gui.c
diffstat 6 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@@ -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) */
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@@ -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) */
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -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) */
--- a/station_gui.c
+++ b/station_gui.c
@@ -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;
--- a/train_gui.c
+++ b/train_gui.c
@@ -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) */
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -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;