diff options
| author | Max Horn | 2004-06-27 13:15:23 +0000 |
|---|---|---|
| committer | Max Horn | 2004-06-27 13:15:23 +0000 |
| commit | 907f2dbf192afdfd9fee2984a2fca8254be1ccd2 (patch) | |
| tree | f64d3f9e6ae12825a63445373cf142c1e5d3b43a /scumm | |
| parent | 2da9dc7fe4db0293c82e0f6e15740716849d0b7c (diff) | |
| download | scummvm-rg350-907f2dbf192afdfd9fee2984a2fca8254be1ccd2.tar.gz scummvm-rg350-907f2dbf192afdfd9fee2984a2fca8254be1ccd2.tar.bz2 scummvm-rg350-907f2dbf192afdfd9fee2984a2fca8254be1ccd2.zip | |
Use existing ScummVM functionality for packed structs
svn-id: r14079
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/resource_v7he.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scumm/resource_v7he.h b/scumm/resource_v7he.h index a386069b95..84129bad10 100644 --- a/scumm/resource_v7he.h +++ b/scumm/resource_v7he.h @@ -134,10 +134,9 @@ class Win32ResExtractor { * Structures */ -#if !defined (WIN32) -#define PACKED __attribute__ ((packed)) -#endif -#pragma pack(1) +#if !defined(__GNUC__) + #pragma START_PACK_STRUCTS +#endif struct WinLibrary { File *file; @@ -184,7 +183,7 @@ class Win32ResExtractor { uint16 reserved; uint16 type; uint16 count; - Win32CursorIconDirEntry entries[1] PACKED; + Win32CursorIconDirEntry entries[1] GCC_PACK; }; struct Win32CursorIconFileDirEntry { @@ -419,7 +418,9 @@ class Win32ResExtractor { uint16 number_of_id_entries; }; -#pragma pack() +#if !defined(__GNUC__) + #pragma END_PACK_STRUCTS +#endif /* * Function Prototypes |