[Scummvm-cvs-logs] CVS: scummvm/common util.h,1.15,1.16

Max Horn fingolfin at users.sourceforge.net
Sat May 17 16:37:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv13644/common

Modified Files:
	util.h 
Log Message:
make ARRAYSIZE 'return' an int

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- util.h	15 May 2003 21:40:36 -0000	1.15
+++ util.h	17 May 2003 23:36:47 -0000	1.16
@@ -38,7 +38,7 @@
 template<class T>
 static inline void SWAP(T &a, T &b) { T tmp = a; a = b; b = tmp; }
 
-#define ARRAYSIZE(x) (sizeof(x) / sizeof(x[0]))
+#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
 
 int RGBMatch(byte *palette, int r, int g, int b);
 int Blend(int src, int dst, byte *palette);





More information about the Scummvm-git-logs mailing list