cpp/openttd-patchpack/source Changeset - r2290:76b881ed03c7

Changeset - r2290:76b881ed03c7

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

truelight - 19 years ago 2005-08-06 14:58:06
truelight@openttd.org

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

2 files changed with 4 insertions and 2 deletions:

openttd.c

thread.c

0 comments (0 inline, 0 general)

openttd.c

➞

Show inline comments

@@ @@ -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();

thread.c

➞

Show inline comments

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

0 comments (0 inline, 0 general)