[Scummvm-cvs-logs] CVS: residual bits.h,1.18,1.19 stdafx.h,1.8,1.9
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Jan 1 03:14:01 CET 2006
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5345
Modified Files:
bits.h stdafx.h
Log Message:
fixed ARRAYSIZE compatibility for vc2005
Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- bits.h 1 Jan 2005 12:27:55 -0000 1.18
+++ bits.h 1 Jan 2006 11:13:37 -0000 1.19
@@ -48,8 +48,6 @@
#define snprintf _snprintf
- #define ZLIB_WINAPI
-
#if defined(CHECK_HEAP)
#undef CHECK_HEAP
#define CHECK_HEAP checkHeap();
Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/residual/stdafx.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- stdafx.h 1 Jan 2005 12:27:56 -0000 1.8
+++ stdafx.h 1 Jan 2006 11:13:37 -0000 1.9
@@ -77,6 +77,10 @@
#include <windows.h>
+#if defined(ARRAYSIZE)
+// VS2005beta2 introduces new stuff in winnt.h
+#undef ARRAYSIZE
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -90,7 +94,7 @@
#include <winuser.h>
#include <direct.h>
#define strcasecmp stricmp
-#define M_PI 3.14159265
+#define M_PI 3.14159265358979323846
#ifndef _MSC_VER
#include <stdint.h>
More information about the Scummvm-git-logs
mailing list