[Scummvm-cvs-logs] CVS: scummvm/gob gob.h,1.3,1.4
Eugene Sandulenko
sev at users.sourceforge.net
Tue Apr 12 17:49:16 CEST 2005
Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17858
Modified Files:
gob.h
Log Message:
Make VAR macros safer.
Index: gob.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gob.h 10 Apr 2005 17:13:17 -0000 1.3
+++ gob.h 13 Apr 2005 00:47:17 -0000 1.4
@@ -30,11 +30,11 @@
#include "base/engine.h"
#define VAR_OFFSET(offs) (*(uint32 *)(inter_variables + (offs)))
-#define VAR(var) VAR_OFFSET((var << 2))
+#define VAR(var) VAR_OFFSET((var) << 2)
#define VAR_ADDRESS(var) (&VAR(var))
-#define WRITE_VAR_OFFSET(offs, val) (VAR_OFFSET(offs) = val)
-#define WRITE_VAR(var, val) WRITE_VAR_OFFSET((var << 2), val)
+#define WRITE_VAR_OFFSET(offs, val) (VAR_OFFSET(offs) = (val))
+#define WRITE_VAR(var, val) WRITE_VAR_OFFSET((var) << 2, (val))
namespace Gob {
More information about the Scummvm-git-logs
mailing list