[Scummvm-cvs-logs] CVS: scummvm/backends/dc portdefs.h,1.6,1.7 dcmain.cpp,1.23,1.24

[Marcus Comstedt]

Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3049

Modified Files:
	portdefs.h dcmain.cpp 
Log Message:
Use the name "scummvm_main" for the common main function, like WinCE.

Index: portdefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/portdefs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- portdefs.h	6 Jan 2004 12:45:26 -0000	1.6
+++ portdefs.h	13 Mar 2004 15:17:13 -0000	1.7
@@ -37,5 +37,5 @@
 #undef Timer
 #endif
 #ifndef REAL_MAIN
-#define main scumm_main
+#define main scummvm_main
 #endif

Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dcmain.cpp	13 Mar 2004 14:00:44 -0000	1.23
+++ dcmain.cpp	13 Mar 2004 15:17:13 -0000	1.24
@@ -198,10 +198,9 @@
   init_arm();
 }
 
+extern "C" int scummvm_main(int argc, char *argv[]);
 int main()
 {
-  extern int scumm_main(int argc, char *argv[]);
-
   static char *argv[] = { "scummvm", NULL, NULL, NULL };
   static int argc = 3;
 
@@ -215,7 +214,7 @@
 
   PluginManager::instance().unloadPlugins();
 
-  scumm_main(argc, argv);
+  scummvm_main(argc, argv);
 
   exit(0);
 }