[Scummvm-cvs-logs] SF.net SVN: scummvm: [30954] scummvm/trunk/backends/fs/windows/windows-fs. cpp

[thebluegr at users.sourceforge.net]

Revision: 30954
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30954&view=rev
Author:   thebluegr
Date:     2008-02-24 07:00:28 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
Stop redefinitions of ARRAYSIZE

Modified Paths:
--------------
    scummvm/trunk/backends/fs/windows/windows-fs.cpp

Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp	2008-02-24 14:38:19 UTC (rev 30953)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp	2008-02-24 15:00:28 UTC (rev 30954)
@@ -24,8 +24,13 @@
 
 #ifdef WIN32
 
+#ifdef ARRAYSIZE
+#undef ARRAYSIZE
+#endif
 #ifdef _WIN32_WCE
 #include <windows.h>
+// winnt.h defines ARRAYSIZE, but we want our own one...
+#undef ARRAYSIZE
 #undef GetCurrentDirectory
 #endif
 #include "backends/fs/abstract-fs.h"
@@ -34,6 +39,8 @@
 #include <stdlib.h>
 #ifndef _WIN32_WCE
 #include <windows.h>
+// winnt.h defines ARRAYSIZE, but we want our own one...
+#undef ARRAYSIZE
 #endif
 #include <tchar.h>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.