--- a/functions.h Sat May 14 22:51:15 2005 +0000
+++ b/functions.h Sat May 14 23:48:39 2005 +0000
@@ -167,8 +167,6 @@
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);
--- a/misc.c Sat May 14 22:51:15 2005 +0000
+++ b/misc.c Sat May 14 23:48:39 2005 +0000
@@ -113,6 +113,8 @@
}
+#ifdef ENABLE_NETWORK
+
// multi os compatible sleep function
#ifdef __AMIGA__
@@ -157,6 +159,8 @@
#endif
}
+#endif /* ENABLE_NETWORK */
+
void InitializeVehicles(void);
void InitializeWaypoints(void);
void InitializeDepot(void);
--- a/network.h Sat May 14 22:51:15 2005 +0000
+++ b/network.h Sat May 14 23:48:39 2005 +0000
@@ -199,6 +199,7 @@
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 */
--- a/network_core.h Sat May 14 22:51:15 2005 +0000
+++ b/network_core.h Sat May 14 23:48:39 2005 +0000
@@ -7,6 +7,8 @@
// =============================
// Include standard stuff per OS
+#ifdef ENABLE_NETWORK
+
// Windows stuff
#if defined(WIN32)
#include <windows.h>
@@ -74,7 +76,7 @@
# 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 @@
#endif
}
-#endif // NETWORK_CORE_H
+#endif /* ENABLE_NETWORK */
+
+#endif /* NETWORK_CORE_H */
--- a/players.c Sat May 14 22:51:15 2005 +0000
+++ b/players.c Sat May 14 23:48:39 2005 +0000
@@ -713,6 +713,8 @@
ci->client_playas = OWNER_SPECTATOR;
NetworkUpdateClientInfo(ci->client_index);
}
+#else
+ }
#endif /* ENABLE_NETWORK */
} break;
--- a/stdafx.h Sat May 14 22:51:15 2005 +0000
+++ b/stdafx.h Sat May 14 23:48:39 2005 +0000
@@ -139,7 +139,7 @@
#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)