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/boxes.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/boxes.cpp')
| -rw-r--r-- | engines/scumm/boxes.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp index 5a42a99212..a066b448de 100644 --- a/engines/scumm/boxes.cpp +++ b/engines/scumm/boxes.cpp @@ -31,9 +31,7 @@ namespace Scumm { -#if defined(START_PACK_STRUCTS) -#pragma START_PACK_STRUCTS -#endif +#include <common/pack-start.h> // START STRUCT PACKING struct Box { /* Internal walkbox file format */ union { @@ -81,9 +79,7 @@ struct Box { /* Internal walkbox file format */ }; }; -#if defined(END_PACK_STRUCTS) -#pragma END_PACK_STRUCTS -#endif +#include <common/pack-end.h> // END STRUCT PACKING #define BOX_MATRIX_SIZE 2000 #define BOX_DEBUG 0 |