(svn r2814) -Fix: made MorphOS to compile again

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