From 587431f8e838bd08d081d65f18b1f9b8f04566b8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 2 Apr 2006 00:08:22 +0000
Subject: Fully and officially renamed our main function to scummvm_main, thus
 making various backend specific hacks unnecessary. As a consequence, it is
 now the responsibility of the backend to define main. Hence I adapted the SDL
 backend accordingly.

svn-id: r21542
---
 backends/morphos/morphos.h         | 2 --
 backends/morphos/morphos_start.cpp | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'backends/morphos')

diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h
index 46d35689c0..7f919f7080 100644
--- a/backends/morphos/morphos.h
+++ b/backends/morphos/morphos.h
@@ -226,8 +226,6 @@ class AutoLock
 #define AUTO_LOCK	 AutoLock cs(&CritSec);
 
 
-int morphos_main(int argc, char *argv[]);
-
 extern OSystem_MorphOS *TheSystem;
 
 #endif
diff --git a/backends/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp
index f19a96983e..f7ec56f224 100644
--- a/backends/morphos/morphos_start.cpp
+++ b/backends/morphos/morphos_start.cpp
@@ -37,6 +37,7 @@
 #include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "base/gameDetector.h"
+#include "base/main.h"
 #include "common/scaler.h"
 #include "sound/mididrv.h"
 #include "morphos.h"
@@ -433,6 +434,6 @@ int main()
 	if (ScummStory)
 		argv[argc++] = ScummStory;
 
-	return morphos_main(argc, argv);
+	return scummvm_main(argc, argv);
 }
 
-- 
cgit v1.2.3