petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2316) - Fix: [ 1154454 ] Fix BeOS build on Trunk (myob)

Browse Source
This commit is contained in:
Darkvater
2005-05-14 23:48:39 +00:00
parent 788286e9d3
commit 6f06930ee3
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
functions.h
View File

@@ -167,8 +167,6 @@ StringID RealAllocateName(const char *name, byte skip, bool check_double);
void ConvertDayToYMD(YearMonthDay *ymd, uint16 date);
uint ConvertYMDToDay(uint year, uint month, uint day);
uint ConvertIntDate(uint date);
void CSleep(int milliseconds);
/* misc functions */
void MarkTileDirty(int x, int y);

4
misc.c
View File

@@ -113,6 +113,8 @@ void SetDate(uint date)
}
#ifdef ENABLE_NETWORK
// multi os compatible sleep function
#ifdef __AMIGA__
@@ -157,6 +159,8 @@ void CSleep(int milliseconds)
#endif
}
#endif /* ENABLE_NETWORK */
void InitializeVehicles(void);
void InitializeWaypoints(void);
void InitializeDepot(void);

1
network.h
View File

@@ -199,6 +199,7 @@ VARDEF uint8 _network_autoclean_protected; // Unprotect a company after X mont
VARDEF uint16 _network_restart_game_date; // If this year is reached, the server automaticly restarts
NetworkGameList *NetworkQueryServer(const char* host, unsigned short port, bool game_info);
void CSleep(int milliseconds);
#endif /* ENABLE_NETWORK */

8
network_core.h
View File

@@ -7,6 +7,8 @@
// =============================
// Include standard stuff per OS
#ifdef ENABLE_NETWORK
// Windows stuff
#if defined(WIN32)
#include <windows.h>
@@ -74,7 +76,7 @@ typedef struct ifreq IFREQ;
# endif
# endif // BEOS_NET_SERVER
# if defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)
# if !defined(__BEOS__) && defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)
typedef uint32_t in_addr_t;
# endif
@@ -171,4 +173,6 @@ static inline bool SetNoDelay(int d)
#endif
}
#endif // NETWORK_CORE_H
#endif /* ENABLE_NETWORK */
#endif /* NETWORK_CORE_H */

2
players.c
View File

@@ -713,6 +713,8 @@ int32 CmdPlayerCtrl(int x, int y, uint32 flags, uint32 p1, uint32 p2)
ci->client_playas = OWNER_SPECTATOR;
NetworkUpdateClientInfo(ci->client_index);
}
#else
}
#endif /* ENABLE_NETWORK */
} break;

2
stdafx.h
View File

@@ -139,7 +139,7 @@ typedef unsigned int uint32;
#endif
// This is already defined in unix
#if !defined(UNIX) && !defined(__CYGWIN__)
#if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__)
typedef unsigned int uint;
#endif
// Not defined in QNX Neutrino (6.x)