petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
truelight
2005-08-06 14:58:06 +00:00
parent eb826dfb66
commit 4f15ada6cd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openttd.c
View File

@@ -302,7 +302,9 @@ static void LoadIntroGame(void)
if (_music_driver->is_song_playing()) ResetMusic(); if (_music_driver->is_song_playing()) ResetMusic();
} }
#if defined(UNIX) && !defined(__MORPHOS__)
extern void DedicatedFork(void); extern void DedicatedFork(void);
#endif
extern void CheckExternalFiles(void); extern void CheckExternalFiles(void);
int ttd_main(int argc, char* argv[]) 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"); gpmi_path_append(&gpmi_path_packages, "gpmi/packages");
#endif /* GPMI */ #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) // We must fork here, or we'll end up without some resources we need (like sockets)
if (_dedicated_forks) if (_dedicated_forks)
DedicatedFork(); DedicatedFork();

2
thread.c
View File

@@ -6,7 +6,7 @@
#if defined(__AMIGA__) || defined(__MORPHOS__) #if defined(__AMIGA__) || defined(__MORPHOS__)
Thread* OTTDCreateThread(ThreadFunc function, void* arg) { return NULL; } Thread* OTTDCreateThread(ThreadFunc function, void* arg) { return NULL; }
void* OTTDJoinThread(Thread*) { return NULL; } void* OTTDJoinThread(Thread* t) { return NULL; }
#elif defined(__OS2__) #elif defined(__OS2__)