[Scummvm-cvs-logs] SF.net SVN: scummvm: [23458] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Jul 20 22:40:08 CEST 2006
Revision: 23458
http://svn.sourceforge.net/scummvm/?rev=23458&view=rev
Author: fingolfin
Date: 2006-07-09 06:01:15 -0700 (Sun, 09 Jul 2006)
Log Message:
-----------
Use START_PACK_STRUCTS / END_PACK_STRUCTS when available, instead of checking for GCC / not GCC
Modified Paths:
--------------
scummvm/trunk/common/scummsys.h
scummvm/trunk/engines/gob/game.h
scummvm/trunk/engines/gob/goblin.h
scummvm/trunk/engines/gob/map.h
scummvm/trunk/engines/gob/mult.h
scummvm/trunk/engines/gob/scenery.h
scummvm/trunk/engines/gob/video.h
scummvm/trunk/engines/lure/res_struct.h
scummvm/trunk/engines/queen/queen.h
scummvm/trunk/engines/saga/gfx.h
scummvm/trunk/engines/scumm/akos.cpp
scummvm/trunk/engines/scumm/base-costume.h
scummvm/trunk/engines/scumm/boxes.cpp
scummvm/trunk/engines/scumm/file.cpp
scummvm/trunk/engines/scumm/he/intern_he.h
scummvm/trunk/engines/scumm/he/resource_he.h
scummvm/trunk/engines/scumm/intern.h
scummvm/trunk/engines/scumm/object.cpp
scummvm/trunk/engines/scumm/object.h
scummvm/trunk/engines/scumm/player_v2.h
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/thumbnail.cpp
scummvm/trunk/engines/simon/vga.h
scummvm/trunk/engines/sky/sound.cpp
scummvm/trunk/engines/sky/struc.h
scummvm/trunk/engines/sword1/mouse.h
scummvm/trunk/engines/sword1/object.h
scummvm/trunk/engines/sword1/router.h
scummvm/trunk/engines/sword1/sworddefs.h
scummvm/trunk/sound/voc.h
Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/common/scummsys.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -70,6 +70,20 @@
#endif
+//
+// 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.
+//
+// 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)
+
+
#if defined(_MSC_VER) && !defined(__SYMBIAN32__) && !defined(_WIN32_WCE)
#define scumm_stricmp stricmp
@@ -357,11 +371,6 @@
//
// Fallbacks / default values for various special macros
//
-#ifndef START_PACK_STRUCTS
-#define START_PACK_STRUCTS pack(push, 1)
-#define END_PACK_STRUCTS pack(pop)
-#endif
-
#ifndef FORCEINLINE
#define FORCEINLINE inline
#endif
Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/gob/game.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -31,7 +31,10 @@
class Game {
public:
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
+
struct Collision {
int16 id;
int16 left;
@@ -127,7 +130,10 @@
int32 frameDataSize;
int32 vidBufferSize;
} GCC_PACK;
+
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
TotResTable *_totResourceTable;
Collision *_collisionAreas;
Modified: scummvm/trunk/engines/gob/goblin.h
===================================================================
--- scummvm/trunk/engines/gob/goblin.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/gob/goblin.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -37,7 +37,11 @@
class Goblin {
public:
+
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
+
struct Gob_State {
int16 animation;// +0h
int16 layer; // +2h
@@ -92,7 +96,10 @@
char x;
char y;
} GCC_PACK;
+
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
Util::List *_objList;
Gob_Object *_goblins[4];
Modified: scummvm/trunk/engines/gob/map.h
===================================================================
--- scummvm/trunk/engines/gob/map.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/gob/map.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -43,7 +43,9 @@
kDirSE = 0x5100
};
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
struct Point {
int16 x;
@@ -59,7 +61,9 @@
int8 orient; // ??
} GCC_PACK;
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
int16 _mapWidth;
int16 _mapHeight;
Modified: scummvm/trunk/engines/gob/mult.h
===================================================================
--- scummvm/trunk/engines/gob/mult.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/gob/mult.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -31,7 +31,11 @@
class Mult {
public:
+
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
+
struct Mult_AnimData {
int8 animation;
int8 layer;
@@ -156,7 +160,9 @@
int16 field_E;
} GCC_PACK;
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
// Globals
Modified: scummvm/trunk/engines/gob/scenery.h
===================================================================
--- scummvm/trunk/engines/gob/scenery.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/gob/scenery.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -27,7 +27,11 @@
class Scenery {
public:
+
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
+
struct PieceDesc {
int16 left; //NOTE:
int16 right; //These are stored in Little Endian format
@@ -70,7 +74,10 @@
int16 framesCount;
AnimFramePiece *frames;
} GCC_PACK;
+
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
struct Static {
int16 layersCount;
Modified: scummvm/trunk/engines/gob/video.h
===================================================================
--- scummvm/trunk/engines/gob/video.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/gob/video.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -72,7 +72,9 @@
#define RETURN_PRIMARY 0x01
#define DISABLE_SPR_ALLOC 0x20
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
struct Color {
byte red;
@@ -80,7 +82,9 @@
byte blue;
} GCC_PACK;
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
struct PalDesc {
Color *vgaPal;
Modified: scummvm/trunk/engines/lure/res_struct.h
===================================================================
--- scummvm/trunk/engines/lure/res_struct.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/lure/res_struct.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -37,7 +37,7 @@
/* */
/*-------------------------------------------------------------------------*/
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -215,7 +215,7 @@
uint16 hotspotId;
};
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/queen/queen.h
===================================================================
--- scummvm/trunk/engines/queen/queen.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/queen/queen.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -49,8 +49,8 @@
namespace Queen {
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct GameStateHeader {
@@ -60,8 +60,8 @@
char description[32];
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
class BamScene;
Modified: scummvm/trunk/engines/saga/gfx.h
===================================================================
--- scummvm/trunk/engines/saga/gfx.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/saga/gfx.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -78,14 +78,19 @@
}
};
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
+
struct PalEntry {
byte red;
byte green;
byte blue;
} GCC_PACK;
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
struct Color {
int red;
Modified: scummvm/trunk/engines/scumm/akos.cpp
===================================================================
--- scummvm/trunk/engines/scumm/akos.cpp 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/akos.cpp 2006-07-09 13:01:15 UTC (rev 23458)
@@ -36,7 +36,7 @@
namespace Scumm {
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -54,7 +54,7 @@
uint16 akci;
} GCC_PACK;
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/scumm/base-costume.h
===================================================================
--- scummvm/trunk/engines/scumm/base-costume.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/base-costume.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -29,7 +29,7 @@
namespace Scumm {
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -39,7 +39,7 @@
int16 move_x, move_y;
} GCC_PACK;
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/scumm/boxes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/boxes.cpp 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/boxes.cpp 2006-07-09 13:01:15 UTC (rev 23458)
@@ -31,8 +31,8 @@
namespace Scumm {
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct Box { /* Internal walkbox file format */
@@ -81,8 +81,8 @@
} GCC_PACK;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
#define BOX_MATRIX_SIZE 2000
Modified: scummvm/trunk/engines/scumm/file.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file.cpp 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/file.cpp 2006-07-09 13:01:15 UTC (rev 23458)
@@ -1241,7 +1241,10 @@
{ -1, NULL }
};
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
+#endif
+
struct _lfl_index {
byte room_lfl[55];
uint16 room_addr[55];
@@ -1252,7 +1255,10 @@
byte sound_lfl[100];
uint16 sound_addr[100];
} GCC_PACK lfl_index;
+
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
+#endif
bool ScummNESFile::generateResource(int res) {
Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/he/intern_he.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -226,8 +226,8 @@
const char *desc;
};
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct ArrayHeader {
@@ -239,8 +239,8 @@
byte data[1]; //14
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
const OpcodeEntryV72he *_opcodesV72he;
Modified: scummvm/trunk/engines/scumm/he/resource_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/he/resource_he.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -172,8 +172,8 @@
* Structures
*/
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct WinLibrary {
@@ -456,8 +456,8 @@
uint16 number_of_id_entries;
};
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
/*
Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/intern.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -519,9 +519,9 @@
kDwordArray = 6
};
- #if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
- #endif
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
+#endif
struct ArrayHeader {
int16 dim1;
@@ -530,9 +530,9 @@
byte data[1];
} GCC_PACK;
- #if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
- #endif
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
+#endif
const OpcodeEntryV6 *_opcodesV6;
Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/object.cpp 2006-07-09 13:01:15 UTC (rev 23458)
@@ -36,8 +36,8 @@
namespace Scumm {
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct BompHeader { /* Bomp header */
@@ -53,8 +53,8 @@
} GCC_PACK;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/scumm/object.h
===================================================================
--- scummvm/trunk/engines/scumm/object.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/object.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -51,8 +51,8 @@
byte flags;
};
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct RoomHeader {
@@ -159,8 +159,8 @@
} GCC_PACK;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
struct FindObjectInRoom {
Modified: scummvm/trunk/engines/scumm/player_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/player_v2.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -37,8 +37,8 @@
class ScummEngine;
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct channel_data {
@@ -66,8 +66,8 @@
uint16 music_script_nr; // 48
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/saveload.cpp 2006-07-09 13:01:15 UTC (rev 23458)
@@ -53,8 +53,8 @@
char name[32];
};
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct SaveInfoSection {
@@ -69,8 +69,8 @@
uint16 time;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
#define INFOSECTION_VERSION 2
Modified: scummvm/trunk/engines/scumm/thumbnail.cpp
===================================================================
--- scummvm/trunk/engines/scumm/thumbnail.cpp 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/scumm/thumbnail.cpp 2006-07-09 13:01:15 UTC (rev 23458)
@@ -31,8 +31,8 @@
#define THMB_VERSION 1
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
struct ThumbnailHeader {
@@ -43,8 +43,8 @@
byte bpp;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/simon/vga.h
===================================================================
--- scummvm/trunk/engines/simon/vga.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/simon/vga.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -26,8 +26,8 @@
namespace Simon {
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
+#if defined(START_PACK_STRUCTS)
+#pragma START_PACK_STRUCTS
#endif
// Feeble Files
@@ -94,8 +94,8 @@
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
enum DrawFlags {
Modified: scummvm/trunk/engines/sky/sound.cpp
===================================================================
--- scummvm/trunk/engines/sky/sound.cpp 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/sky/sound.cpp 2006-07-09 13:01:15 UTC (rev 23458)
@@ -37,7 +37,7 @@
#define SFXF_START_DELAY 0x80
#define SFXF_SAVE 0x20
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -53,7 +53,7 @@
RoomList roomList[10];
} GCC_PACK;
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/sky/struc.h
===================================================================
--- scummvm/trunk/engines/sky/struc.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/sky/struc.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -36,7 +36,7 @@
uint32 textWidth;
};
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -166,7 +166,7 @@
MegaSet megaSet3; //
} GCC_PACK;
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
Modified: scummvm/trunk/engines/sword1/mouse.h
===================================================================
--- scummvm/trunk/engines/sword1/mouse.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/sword1/mouse.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -48,8 +48,8 @@
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 @@
uint8 dummyData[0x30];
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
class Logic;
Modified: scummvm/trunk/engines/sword1/object.h
===================================================================
--- scummvm/trunk/engines/sword1/object.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/sword1/object.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -32,8 +32,8 @@
#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 @@
// 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
Modified: scummvm/trunk/engines/sword1/router.h
===================================================================
--- scummvm/trunk/engines/sword1/router.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/sword1/router.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -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 @@
int16 dist;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
struct FloorData {
Modified: scummvm/trunk/engines/sword1/sworddefs.h
===================================================================
--- scummvm/trunk/engines/sword1/sworddefs.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/engines/sword1/sworddefs.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -89,8 +89,8 @@
#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 @@
int32 numNodes;
} GCC_PACK;
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
+#if defined(END_PACK_STRUCTS)
+#pragma END_PACK_STRUCTS
#endif
enum fileTypes {
Modified: scummvm/trunk/sound/voc.h
===================================================================
--- scummvm/trunk/sound/voc.h 2006-07-09 12:58:10 UTC (rev 23457)
+++ scummvm/trunk/sound/voc.h 2006-07-09 13:01:15 UTC (rev 23458)
@@ -34,7 +34,7 @@
class AudioStream;
-#if !defined(__GNUC__)
+#if defined(START_PACK_STRUCTS)
#pragma START_PACK_STRUCTS
#endif
@@ -52,7 +52,7 @@
uint8 pack;
} GCC_PACK;
-#if !defined(__GNUC__)
+#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
More information about the Scummvm-git-logs
mailing list