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 /common/scummsys.h | |
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 'common/scummsys.h')
-rw-r--r-- | common/scummsys.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index cb26901ddf..c1bfc50528 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -73,15 +73,15 @@ // // By default we try to use pragma push/pop to ensure various structs we use // are "packed". If your compiler doesn't support this pragma, you are in for -// a problem. If you are lucky, an equivalent pragma is available, in which -// case you can redefine these two macros appropriately. Or maybe your port -// simply *always* packs everything, in which case you could #undefine them. +// a problem. If you are lucky, there is a compiler switch, or another pragma, +// doing the same thing -- in that case, try to modify common/pack-begin.h and +// common/pack-end.h accordingly. Or maybe your port simply *always* packs +// everything, in which case you could #undefine SCUMMVM_USE_PRAGMA_PACK. // // If neither is possible, tough luck. Try to contact the team, maybe we can // come up with a solution, though I wouldn't hold my breath on it :-/. // -#define START_PACK_STRUCTS pack(push, 1) -#define END_PACK_STRUCTS pack(pop) +#define SCUMMVM_USE_PRAGMA_PACK #if defined(_MSC_VER) && !defined(__SYMBIAN32__) && !defined(_WIN32_WCE) |