diff options
| author | Max Horn | 2006-07-22 17:28:48 +0000 |
|---|---|---|
| committer | Max Horn | 2006-07-22 17:28:48 +0000 |
| commit | 2859b647026af1a927d1a74100f125bbc0f77db3 (patch) | |
| tree | e842c9e2e67296f5bbc48645ba49b469edb7bd22 /engines/scumm/file.cpp | |
| parent | 1ffd49604357ed6fd63e133369a89e3b57711ae2 (diff) | |
| download | scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.gz scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.bz2 scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.zip | |
Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)
svn-id: r23569
Diffstat (limited to 'engines/scumm/file.cpp')
| -rw-r--r-- | engines/scumm/file.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp index a043710dea..b08ec0e41f 100644 --- a/engines/scumm/file.cpp +++ b/engines/scumm/file.cpp @@ -1241,9 +1241,7 @@ static ScummNESFile::LFL lfls[] = { { -1, NULL } }; -#if defined(START_PACK_STRUCTS) -#pragma START_PACK_STRUCTS -#endif +#include <common/pack-start.h> // START STRUCT PACKING struct _lfl_index { byte room_lfl[55]; @@ -1256,9 +1254,7 @@ struct _lfl_index { uint16 sound_addr[100]; } lfl_index; -#if defined(END_PACK_STRUCTS) -#pragma END_PACK_STRUCTS -#endif +#include <common/pack-end.h> // END STRUCT PACKING bool ScummNESFile::generateResource(int res) { |