thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop redefinitions of ARRAYSIZE

Browse source 
svn-id: r30954
This commit is contained in:
Filippos Karapetis 2008-02-24 15:00:28 +00:00
parent 622076e15b
commit dbba13a7ac
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backends/fs/windows/windows-fs.cpp
View file

@ -24,8 +24,13 @@
#ifdef WIN32 #ifdef WIN32
#ifdef ARRAYSIZE
#undef ARRAYSIZE
#endif
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#include <windows.h> #include <windows.h>
// winnt.h defines ARRAYSIZE, but we want our own one...
#undef ARRAYSIZE
#undef GetCurrentDirectory #undef GetCurrentDirectory
#endif #endif
#include "backends/fs/abstract-fs.h" #include "backends/fs/abstract-fs.h"
@ -34,6 +39,8 @@
#include <stdlib.h> #include <stdlib.h>
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
#include <windows.h> #include <windows.h>
// winnt.h defines ARRAYSIZE, but we want our own one...
#undef ARRAYSIZE
#endif #endif
#include <tchar.h> #include <tchar.h>