[Scummvm-cvs-logs] CVS: tools util.h,1.12,1.13
Max Horn
fingolfin at users.sourceforge.net
Sat Feb 21 02:38:04 CET 2004
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17837
Modified Files:
util.h
Log Message:
Help some old MSC versions compiling this
Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/tools/util.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- util.h 18 Jan 2004 20:25:02 -0000 1.12
+++ util.h 21 Feb 2004 10:26:06 -0000 1.13
@@ -53,6 +53,12 @@
#if !defined(__cplusplus)
typedef enum { false = 0, true = 1 } bool;
+
+/* If your C compiler doesn't support 'inline', please add a check for it. */
+#if defined(_MSC_VER) && _MSC_VER == 1310
+#define inline __inline
+#endif
+
#endif
@@ -62,11 +68,6 @@
#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
-/* If your C compiler doesn't support 'inline', please add a check for it. */
-#if defined(CHECK_FOR_OLD_C_COMPILER)
-#define inline
-#endif
-
static inline uint32 SWAP_32(uint32 a) {
return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
((a << 24) & 0xFF000000);
More information about the Scummvm-git-logs
mailing list