ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use existing ScummVM functionality for packed structs

Browse Source 
svn-id: r14079
This commit is contained in:
Max Horn
2004-06-27 13:15:23 +00:00
parent 2da9dc7fe4
commit 907f2dbf19
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/resource_v7he.h
+7 -6
View File
@@ -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