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/maemo/main.cpp   | 4 +---
 backends/maemo/portdefs.h | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'backends/maemo')

diff --git a/backends/maemo/main.cpp b/backends/maemo/main.cpp
index 7ef2bfd2f1..231f319158 100644
--- a/backends/maemo/main.cpp
+++ b/backends/maemo/main.cpp
@@ -20,7 +20,6 @@
  *
  */
  
-#define	REAL_MAIN
 #include <common/stdafx.h>
 #include <common/scummsys.h>
 #include <X11/Xlib.h> 
@@ -29,6 +28,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_syswm.h>
 
+#include "base/main.h"
 #include <hildon-widgets/hildon-app.h>
 #include <gtk/gtk.h>
 #include <libosso.h>
@@ -48,8 +48,6 @@ void set_doubling(unsigned char enable) {
   XSPSetPixelDoubling(wminfo.info.x11.display, 0, enable);
 }
 
-extern "C" int scummvm_main(int argc, char *argv[]);
-
 int main(int argc, char *argv[]) {
     osso_context_t *osso_context;
 
diff --git a/backends/maemo/portdefs.h b/backends/maemo/portdefs.h
index 82894331b3..f825e5c4e2 100644
--- a/backends/maemo/portdefs.h
+++ b/backends/maemo/portdefs.h
@@ -52,12 +52,6 @@ typedef signed int int32;
 /* Whether we should use i386 assembly routines */
 #undef USE_NASM
 
-#undef main
-
-#ifndef REAL_MAIN
-#define main scummvm_main
-#endif
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-- 
cgit v1.2.3