summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2005-08-06 14:58:06 +0000
committertruelight <truelight@openttd.org>2005-08-06 14:58:06 +0000
commit4f15ada6cdd2b322f8f2b7a0ad41be7c2cda1192 (patch)
tree99e61820f44e2ac22558f47fcb7e147d9d0218bd
parenteb826dfb66deedcc73932d4afec01f94b2725d3a (diff)
downloadopenttd-4f15ada6cdd2b322f8f2b7a0ad41be7c2cda1192.tar.xz
(svn r2814) -Fix: made MorphOS to compile again
-rw-r--r--openttd.c4
-rw-r--r--thread.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/openttd.c b/openttd.c
index f5659562b..4388866be 100644
--- a/openttd.c
+++ b/openttd.c
@@ -302,7 +302,9 @@ static void LoadIntroGame(void)
if (_music_driver->is_song_playing()) ResetMusic();
}
+#if defined(UNIX) && !defined(__MORPHOS__)
extern void DedicatedFork(void);
+#endif
extern void CheckExternalFiles(void);
int ttd_main(int argc, char* argv[])
@@ -417,7 +419,7 @@ int ttd_main(int argc, char* argv[])
gpmi_path_append(&gpmi_path_packages, "gpmi/packages");
#endif /* GPMI */
-#ifdef UNIX
+#if defined(UNIX) && !defined(__MORPHOS__)
// We must fork here, or we'll end up without some resources we need (like sockets)
if (_dedicated_forks)
DedicatedFork();
diff --git a/thread.c b/thread.c
index 354f241c6..574301ea0 100644
--- a/thread.c
+++ b/thread.c
@@ -6,7 +6,7 @@
#if defined(__AMIGA__) || defined(__MORPHOS__)
Thread* OTTDCreateThread(ThreadFunc function, void* arg) { return NULL; }
-void* OTTDJoinThread(Thread*) { return NULL; }
+void* OTTDJoinThread(Thread* t) { return NULL; }
#elif defined(__OS2__)