# HG changeset patch
# User truelight
# Date 1123340286 0
# Node ID bdbb059ddba7128a268181aca24b7418f6fe8d20
# Parent  272e091eb99f3c1f9aa7de163ba2ab419a4f4fe6
(svn r2814) -Fix: made MorphOS to compile again

diff -r 272e091eb99f -r bdbb059ddba7 openttd.c
--- a/openttd.c	Sat Aug 06 07:15:17 2005 +0000
+++ b/openttd.c	Sat Aug 06 14:58:06 2005 +0000
@@ -302,7 +302,9 @@
 	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 @@
 	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 -r 272e091eb99f -r bdbb059ddba7 thread.c
--- a/thread.c	Sat Aug 06 07:15:17 2005 +0000
+++ b/thread.c	Sat Aug 06 14:58:06 2005 +0000
@@ -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__)