diff options
| author | Filippos Karapetis | 2008-02-24 15:00:28 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-02-24 15:00:28 +0000 |
| commit | dbba13a7accd943904614223a8b341283d6ca7f5 (patch) | |
| tree | 05d97f101bf0e52427a52089cdcb57f2b45d290d /backends/fs | |
| parent | 622076e15b150393571d4797f402819ccb5eada1 (diff) | |
| download | scummvm-rg350-dbba13a7accd943904614223a8b341283d6ca7f5.tar.gz scummvm-rg350-dbba13a7accd943904614223a8b341283d6ca7f5.tar.bz2 scummvm-rg350-dbba13a7accd943904614223a8b341283d6ca7f5.zip | |
Stop redefinitions of ARRAYSIZE
svn-id: r30954
Diffstat (limited to 'backends/fs')
| -rw-r--r-- | backends/fs/windows/windows-fs.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index c09735d8c5..cbb93e8cd6 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -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> |