forked from mirror/OpenTTD
(svn r1411) -Fix: structure packing in the OS/2 version (eg, with the old loader).
This commit is contained in:
@@ -14,7 +14,7 @@ extern byte _name_array[512][32];
|
||||
extern TileIndex _animated_tile_list[256];
|
||||
extern uint16 _custom_sprites_base;
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#if defined(_MSC_VER) || defined(__WATCOMC__)
|
||||
#pragma pack(push, 1)
|
||||
#endif
|
||||
|
||||
@@ -499,7 +499,7 @@ typedef struct {
|
||||
} GCC_PACK OldMain;
|
||||
assert_compile(sizeof(OldMain) == 487801 + 256*256*2);
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#if defined(_MSC_VER) || defined(__WATCOMC__)
|
||||
#pragma pack(pop)
|
||||
#endif
|
||||
|
||||
|
786
openttd.tgt
786
openttd.tgt
File diff suppressed because it is too large
Load Diff
@@ -43,7 +43,7 @@ WFileName
|
||||
17
|
||||
..\..\openttd.tgt
|
||||
47
|
||||
49
|
||||
58
|
||||
11
|
||||
VComponent
|
||||
12
|
||||
|
@@ -20,7 +20,7 @@ typedef struct {
|
||||
//************************************************
|
||||
//*** SCREENSHOT CODE FOR WINDOWS BITMAP (.BMP)
|
||||
//************************************************
|
||||
#if defined(_MSC_VER)
|
||||
#if defined(_MSC_VER) || defined(__WATCOMC__)
|
||||
#pragma pack(push, 1)
|
||||
#endif
|
||||
|
||||
@@ -32,7 +32,7 @@ typedef struct BitmapFileHeader {
|
||||
} GCC_PACK BitmapFileHeader;
|
||||
assert_compile(sizeof(BitmapFileHeader) == 14);
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#if defined(_MSC_VER) || defined(__WATCOMC__)
|
||||
#pragma pack(pop)
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user