cpp/openttd-patchpack/source Changeset - r1812:a78a2f58cdc8

Changeset - r1812:a78a2f58cdc8

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

Darkvater - 19 years ago 2005-05-14 23:48:39
darkvater@openttd.org

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

6 files changed with 14 insertions and 5 deletions:

functions.h

misc.c

network.h

network_core.h

players.c

stdafx.h

0 comments (0 inline, 0 general)

functions.h

➞

Show inline comments

@@ @@ -167,8 +167,6 @@ StringID RealAllocateName(const char *na @@
 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);

misc.c

➞

Show inline comments

@@ @@ -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);

network.h

➞

Show inline comments

@@ @@ -199,6 +199,7 @@ VARDEF uint8 _network_autoclean_protecte @@
 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 */

network_core.h

➞

Show inline comments

@@ @@ -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 */

players.c

➞

Show inline comments

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

stdafx.h

➞

Show inline comments

@@ @@ -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)

0 comments (0 inline, 0 general)