[Scummvm-cvs-logs] SF.net SVN: scummvm:[33306] residual/trunk/engine

[aquadran at users.sourceforge.net]

Revision: 33306
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33306&view=rev
Author:   aquadran
Date:     2008-07-26 17:56:00 +0000 (Sat, 26 Jul 2008)

Log Message:
-----------
fixes for amigaos compiler

Modified Paths:
--------------
    residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp
    residual/trunk/engine/lua.cpp

Modified: residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp	2008-07-26 14:19:21 UTC (rev 33305)
+++ residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp	2008-07-26 17:56:00 UTC (rev 33306)
@@ -36,6 +36,7 @@
 #endif
 
 #include "common/util.h"
+#include "common/debug.h"
 #include "engine/backend/fs/abstract-fs.h"
 
 #define ENTER() /* debug(6, "Enter") */

Modified: residual/trunk/engine/lua.cpp
===================================================================
--- residual/trunk/engine/lua.cpp	2008-07-26 14:19:21 UTC (rev 33305)
+++ residual/trunk/engine/lua.cpp	2008-07-26 17:56:00 UTC (rev 33306)
@@ -270,7 +270,7 @@
 	const char *name;
 	char buf[256];
 	const char *filename;
-	int line;
+	int32 line;
 
 	DEBUG_FUNCTION();
 	if (!lua_isfunction(lua_getparam(1))) {
@@ -294,7 +294,7 @@
 			else if (line < 0)
 				sprintf(buf, "%.100s", filename);
 			else {
-				sprintf(buf, "function (%.100s:%d)", filename, line);
+				sprintf(buf, "function (%.100s:%d)", filename, (int)line);
 				filename = NULL;
 			}
 		}


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