[Scummvm-cvs-logs] CVS: scummvm/saga saga.h,1.81,1.82 script.h,1.58,1.59

Eugene Sandulenko sev at users.sourceforge.net
Fri Jan 21 15:17:38 CET 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27048

Modified Files:
	saga.h script.h 
Log Message:
Fix compilation


Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- saga.h	21 Jan 2005 21:55:53 -0000	1.81
+++ saga.h	21 Jan 2005 23:16:38 -0000	1.82
@@ -75,7 +75,7 @@
 #define OBJECT_TYPE_SHIFT 13
 #define OBJECT_TYPE_MASK ((1 << OBJECT_TYPE_SHIFT) - 1)
 
-#define memoryError(Place) error(Place##" Memory allocation error.")
+#define memoryError(Place) error("%s Memory allocation error.", Place)
 
 struct RSCFILE_CONTEXT;
 struct StringList;

Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- script.h	21 Jan 2005 21:55:53 -0000	1.58
+++ script.h	21 Jan 2005 23:16:38 -0000	1.59
@@ -54,7 +54,7 @@
 	kAddressStatic     = 1,	// offset from global variables
 	kAddressModule     = 2,	// offset from start of module
 	kAddressStack      = 3,	// offset from stack
-	kAddressThread     = 4,	// offset from thread structure
+	kAddressThread     = 4	// offset from thread structure
 /*	kAddressId         = 5,	// offset from const id object
 	kAddressIdIndirect = 6,	// offset from stack id object
 	kAddressIndex      = 7	// index from id*/





More information about the Scummvm-git-logs mailing list