summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2005-03-15 12:21:59 +0000
committerdarkvater <darkvater@openttd.org>2005-03-15 12:21:59 +0000
commitcc99c3e262180a25209e120ac38dc5fefc4201d4 (patch)
tree3609255607f8ca6b4038f71bc5f9be6dd577e873
parent2c762a67ab731213934f0f61d348d5dbad119dfa (diff)
downloadopenttd-cc99c3e262180a25209e120ac38dc5fefc4201d4.tar.xz
(svn r2011) - Fix: [ 1162209 ] Fix OS/2 build (orudge) #2
-rw-r--r--network_core.h1
-rw-r--r--station_cmd.c5
-rw-r--r--train_cmd.c7
3 files changed, 8 insertions, 5 deletions
diff --git a/network_core.h b/network_core.h
index 4114f5e41..0ab9942c8 100644
--- a/network_core.h
+++ b/network_core.h
@@ -111,6 +111,7 @@ typedef struct ifreq IFREQ;
# include <nerrno.h>
# define INADDR_NONE 0xffffffff
+typedef int socklen_t;
typedef unsigned long in_addr_t;
#endif // OS/2
diff --git a/station_cmd.c b/station_cmd.c
index 03632fc59..cd126adf3 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -634,10 +634,13 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
uint old_acc, new_acc;
const RoadStop *cur_rs;
int i;
- Rectangle rect = { MapSizeX(), MapSizeY(), 0, 0 };
+ Rectangle rect;
int rad;
AcceptedCargo accepts;
+ rect.min_x = MapSizeX();
+ rect.min_y = MapSizeY();
+ rect.max_x = rect.max_y = 0;
// Don't update acceptance for a buoy
if (st->had_vehicle_of_type & HVOT_BUOY)
return;
diff --git a/train_cmd.c b/train_cmd.c
index 409c9525b..8047f884f 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -2589,10 +2589,9 @@ red_light: {
v->progress = 255-10;
if (++v->load_unload_time_rem < _patches.wait_twoway_signal * 73) {
TileIndex o_tile = gp.new_tile + TileOffsByDir(enterdir);
- VehicleAtSignalData vasd = {
- o_tile,
- dir ^ 4
- };
+ VehicleAtSignalData vasd;
+ vasd.tile = o_tile;
+ vasd.direction = dir ^ 4;
/* check if a train is waiting on the other side */
if (VehicleFromPos(o_tile, &vasd, CheckVehicleAtSignal) == NULL)