[Scummvm-cvs-logs] SF.net SVN: scummvm: [21805] scummvm/trunk/base/gameDetector.cpp

[chrilith at users.sourceforge.net]

Revision: 21805
Author:   chrilith
Date:     2006-04-11 11:19:54 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21805&view=rev

Log Message:
-----------
Fixed crash with PalmOS ARM version : global objects are allocated but constructors are not called - anyway this var is useless with PalmOS version

Modified Paths:
--------------
    scummvm/trunk/base/gameDetector.cpp
Modified: scummvm/trunk/base/gameDetector.cpp
===================================================================
--- scummvm/trunk/base/gameDetector.cpp	2006-04-11 18:16:53 UTC (rev 21804)
+++ scummvm/trunk/base/gameDetector.cpp	2006-04-11 18:19:54 UTC (rev 21805)
@@ -128,8 +128,11 @@
 ;
 #endif
 
-
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
 static Common::String s_appName("scummvm");
+#else
+static const char *s_appName = "scummvm";
+#endif
 
 static void usage(const char *s, ...) GCC_PRINTF(1, 2);
 
@@ -141,7 +144,9 @@
 	vsnprintf(buf, STRINGBUFLEN, s, va);
 	va_end(va);
 
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
 	printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str());
+#endif
 	exit(1);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.