aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he/resource_he.h
diff options
context:
space:
mode:
authorMax Horn2006-07-22 17:28:48 +0000
committerMax Horn2006-07-22 17:28:48 +0000
commit2859b647026af1a927d1a74100f125bbc0f77db3 (patch)
treee842c9e2e67296f5bbc48645ba49b469edb7bd22 /engines/scumm/he/resource_he.h
parent1ffd49604357ed6fd63e133369a89e3b57711ae2 (diff)
downloadscummvm-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/he/resource_he.h')
-rw-r--r--engines/scumm/he/resource_he.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index 5176f6bb41..468812a236 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -172,9 +172,7 @@ class Win32ResExtractor : public ResExtractor {
* Structures
*/
-#if defined(START_PACK_STRUCTS)
-#pragma START_PACK_STRUCTS
-#endif
+#include <common/pack-start.h> // START STRUCT PACKING
struct WinLibrary {
Common::File *file;
@@ -456,9 +454,7 @@ class Win32ResExtractor : public ResExtractor {
uint16 number_of_id_entries;
};
-#if defined(END_PACK_STRUCTS)
-#pragma END_PACK_STRUCTS
-#endif
+#include <common/pack-end.h> // END STRUCT PACKING
/*
* Function Prototypes