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

6 files changed, 14 insertions, 5 deletions

diff --git a/functions.h b/functions.h
index 032e3c94f..5d51619fe 100644
--- a/functions.h
+++ b/functions.h
@@ -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);
diff --git a/misc.c b/misc.c
index 91218efa8..9b40ace81 100644
--- a/misc.c
+++ b/misc.c
@@ -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);
diff --git a/network.h b/network.h
index 752cb6945..79227e44b 100644
--- a/network.h
+++ b/network.h
@@ -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 */
 
diff --git a/network_core.h b/network_core.h
index 4c92be82b..1b36b462d 100644
--- a/network_core.h
+++ b/network_core.h
@@ -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 */
diff --git a/players.c b/players.c
index 94ad538e1..e196fbc13 100644
--- a/players.c
+++ b/players.c
@@ -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;
 
diff --git a/stdafx.h b/stdafx.h
index 22c7024c1..3d35aed91 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -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)