diff options
| author | Max Horn | 2006-07-09 13:01:15 +0000 |
|---|---|---|
| committer | Max Horn | 2006-07-09 13:01:15 +0000 |
| commit | f35f4a4d1c41a8d186621b912b985dd5d796632a (patch) | |
| tree | 1468779935932e47d32e838458df8d2cf3a5bbe8 /engines/sword1 | |
| parent | 880838514f28fd298e6418f2096d61b3f757e237 (diff) | |
| download | scummvm-rg350-f35f4a4d1c41a8d186621b912b985dd5d796632a.tar.gz scummvm-rg350-f35f4a4d1c41a8d186621b912b985dd5d796632a.tar.bz2 scummvm-rg350-f35f4a4d1c41a8d186621b912b985dd5d796632a.zip | |
Use START_PACK_STRUCTS / END_PACK_STRUCTS when available, instead of checking for GCC / not GCC
svn-id: r23458
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/mouse.h | 8 | ||||
| -rw-r--r-- | engines/sword1/object.h | 8 | ||||
| -rw-r--r-- | engines/sword1/router.h | 8 | ||||
| -rw-r--r-- | engines/sword1/sworddefs.h | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h index 8512d85791..35b2bc7324 100644 --- a/engines/sword1/mouse.h +++ b/engines/sword1/mouse.h @@ -48,8 +48,8 @@ struct MouseObj { Object *compact; }; -#if !defined(__GNUC__) - #pragma START_PACK_STRUCTS +#if defined(START_PACK_STRUCTS) +#pragma START_PACK_STRUCTS #endif struct MousePtr { @@ -61,8 +61,8 @@ struct MousePtr { uint8 dummyData[0x30]; } GCC_PACK; -#if !defined(__GNUC__) - #pragma END_PACK_STRUCTS +#if defined(END_PACK_STRUCTS) +#pragma END_PACK_STRUCTS #endif class Logic; diff --git a/engines/sword1/object.h b/engines/sword1/object.h index 61727e7abc..e8f80eaf2d 100644 --- a/engines/sword1/object.h +++ b/engines/sword1/object.h @@ -32,8 +32,8 @@ namespace Sword1 { #define O_GRID_SIZE 200 #define EXTRA_GRID_SIZE 20 -#if !defined(__GNUC__) - #pragma START_PACK_STRUCTS +#if defined(START_PACK_STRUCTS) +#pragma START_PACK_STRUCTS #endif struct OEventSlot { //receiving event list in the compact - @@ -120,8 +120,8 @@ struct Object { // mega size = 12340 bytes (+ 8 byte offset table + 20 byte header = 12368) } GCC_PACK; -#if !defined(__GNUC__) - #pragma END_PACK_STRUCTS +#if defined(END_PACK_STRUCTS) +#pragma END_PACK_STRUCTS #endif } // End of namespace Sword1 diff --git a/engines/sword1/router.h b/engines/sword1/router.h index b20a70a481..0d8645c105 100644 --- a/engines/sword1/router.h +++ b/engines/sword1/router.h @@ -27,8 +27,8 @@ namespace Sword1 { -#if !defined(__GNUC__) - #pragma START_PACK_STRUCTS +#if defined(START_PACK_STRUCTS) +#pragma START_PACK_STRUCTS #endif struct BarData { @@ -53,8 +53,8 @@ struct NodeData { int16 dist; } GCC_PACK; -#if !defined(__GNUC__) - #pragma END_PACK_STRUCTS +#if defined(END_PACK_STRUCTS) +#pragma END_PACK_STRUCTS #endif struct FloorData { diff --git a/engines/sword1/sworddefs.h b/engines/sword1/sworddefs.h index 4b057245c5..019cdcb756 100644 --- a/engines/sword1/sworddefs.h +++ b/engines/sword1/sworddefs.h @@ -89,8 +89,8 @@ namespace Sword1 { #define MAX_text_obs 2 //text compacts #define TEXT_sect 149 //text compacts exist in section 149, probably after all the megas -#if !defined(__GNUC__) - #pragma START_PACK_STRUCTS +#if defined(START_PACK_STRUCTS) +#pragma START_PACK_STRUCTS #endif struct Header { @@ -134,8 +134,8 @@ struct WalkGridHeader { int32 numNodes; } GCC_PACK; -#if !defined(__GNUC__) - #pragma END_PACK_STRUCTS +#if defined(END_PACK_STRUCTS) +#pragma END_PACK_STRUCTS #endif enum fileTypes { |