diff options
| author | Kostas Nakos | 2007-04-09 18:55:45 +0000 |
|---|---|---|
| committer | Kostas Nakos | 2007-04-09 18:55:45 +0000 |
| commit | 4bf26957aa41cf3bb30bfcd2727381f4c3cc89c9 (patch) | |
| tree | 9294a9bb45ad439a7c02abb1ab508ca262d187f5 /engines/scumm/he | |
| parent | 9c7a8bd963ca71feec56082f66004d9b1923abcf (diff) | |
| download | scummvm-rg350-4bf26957aa41cf3bb30bfcd2727381f4c3cc89c9.tar.gz scummvm-rg350-4bf26957aa41cf3bb30bfcd2727381f4c3cc89c9.tar.bz2 scummvm-rg350-4bf26957aa41cf3bb30bfcd2727381f4c3cc89c9.zip | |
silence a compiler symbol redefinition warning
svn-id: r26441
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/resource_he.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index e4e4d73e13..c04055962e 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -56,9 +56,17 @@ namespace Scumm { #define IMAGE_DOS_SIGNATURE 0x5A4D /* MZ */ #define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */ +/* The following symbols below and another group a few lines below are defined in + * the windows header, at least in wince and most likely in plain win32 as well. + * Defining them out silences a redefinition warning in gcc. + * If the same problem arises in win32 builds as well, please replace + * _WIN32_WCE with _WIN32 which is also defined in the wince platform. + */ +#ifndef _WIN32_WCE #define IMAGE_SCN_CNT_CODE 0x00000020 #define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 #define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 +#endif // Only IMAGE_DIRECTORY_ENTRY_RESOURCE is used: #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 @@ -77,6 +85,7 @@ namespace Scumm { #define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 #define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 +#ifndef _WIN32_WCE // Only RT_GROUP_CURSOR and RT_GROUP_ICON are used #define RT_CURSOR 1 #define RT_BITMAP 2 @@ -91,6 +100,7 @@ namespace Scumm { #define RT_MESSAGELIST 11 #define RT_GROUP_CURSOR 12 #define RT_GROUP_ICON 14 +#endif #define RETURN_IF_BAD_POINTER(r, x) \ if (!check_offset(fi->memory, fi->total_size, fi->file->name(), &(x), sizeof(x))) \ |