AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-24 04:29:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from fabiangreffrath/portability-mingw32

Browse Source 
Fix compilation with non-MSCV compilers, e.g. MinGW
This commit is contained in:
James Haley 2016-08-20 02:14:59 -05:00 committed by GitHub
commit fa913d5a25
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/m_misc.c
View File

@ -2221,7 +2221,7 @@ typedef unsigned long dword_t;
typedef long long_t; typedef long long_t;
typedef unsigned char ubyte_t; typedef unsigned char ubyte_t;
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(push, 1) #pragma pack(push, 1)
#endif #endif
@ -2249,7 +2249,7 @@ typedef struct tagBITMAPINFOHEADER
dword_t biClrImportant; dword_t biClrImportant;
} __attribute__ ((packed)) BITMAPINFOHEADER; } __attribute__ ((packed)) BITMAPINFOHEADER;
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(pop) #pragma pack(pop)
#endif #endif

4
Source/p_spec.c
View File

@ -69,7 +69,7 @@ typedef struct
int speed; int speed;
} anim_t; } anim_t;
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(push, 1) #pragma pack(push, 1)
#endif #endif
@ -84,7 +84,7 @@ typedef struct
int speed; int speed;
} __attribute__ ((packed)) animdef_t; //jff 3/23/98 pack to read from memory } __attribute__ ((packed)) animdef_t; //jff 3/23/98 pack to read from memory
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(pop) #pragma pack(pop)
#endif #endif

4
Source/p_spec.h
View File

@ -514,7 +514,7 @@ typedef enum
// switch animation structure type // switch animation structure type
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(push, 1) #pragma pack(push, 1)
#endif #endif
@ -525,7 +525,7 @@ typedef struct
short episode; short episode;
} __attribute__ ((packed)) switchlist_t; //jff 3/23/98 pack to read from memory } __attribute__ ((packed)) switchlist_t; //jff 3/23/98 pack to read from memory
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(pop) #pragma pack(pop)
#endif #endif

4
Source/w_wad.h
View File

@ -34,7 +34,7 @@
// //
// haleyjd 01/21/05: these structs must be packed // haleyjd 01/21/05: these structs must be packed
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(push, 1) #pragma pack(push, 1)
#endif #endif
@ -52,7 +52,7 @@ typedef struct
char name[8]; char name[8];
} filelump_t; } filelump_t;
#ifdef _MSC_VER #ifdef _WIN32
#pragma pack(pop) #pragma pack(pop)
#endif #endif