re-define "pragma pack()" on a per-struct base (fabiangreffrath#20)

* re-define "pragma pack()" on a per-struct base

Fixes fabiangreffrath#20 

let's see what this breaks first

* pack structs in dosbox/dbopl.h

* game runs, config loads, savegames load

Author: fabiangreffrath

dosbox/dbopl.cpp

@@ -48,6 +48,7 @@
 //#include "dosbox.h"
 #include "dbopl.h"
 
+
 #ifndef PI
 #define PI 3.14159265358979323846
 #endif

dosbox/dbopl.h

@@ -82,7 +82,7 @@ enum {
 	SHIFT_KEYCODE = 24,
 };
 
-struct Operator {
+PACKED_STRUCT( Operator {
 public:
 	//Masks for operator 20 values
 	enum {
@@ -171,9 +171,9 @@ struct Operator {
 	Bits GetWave( Bitu index, Bitu vol );
 public:
 	Operator();
-};
+});
 
-struct Channel {
+PACKED_STRUCT( Channel {
 	Operator op[2];
 	inline Operator* Op( Bitu index ) {
 		return &( ( this + (index >> 1) )->op[ index & 1 ]);
@@ -207,9 +207,9 @@ struct Channel {
 	template<SynthMode mode>
 	Channel* BlockTemplate( Chip* chip, Bit32u samples, Bit32s* output );
 	Channel();
-};
+});
 
-struct Chip {
+PACKED_STRUCT( Chip {
 	//This is used as the base counter for vibrato and tremolo
 	Bit32u lfoCounter;
 	Bit32u lfoAdd;
@@ -261,7 +261,7 @@ struct Chip {
 	void Setup( Bit32u r );
 
 	Chip();
-};
+});
 
 /*struct Handler : public Adlib::Handler {
 	DBOPL::Chip chip;

id_ca.cpp

@@ -36,17 +36,17 @@ loaded into the data segment
 =============================================================================
 */
 
-typedef struct
+typedef PACKED_STRUCT(
 {
     word bit0,bit1;       // 0-255 is a character, > is a pointer to a node
-} huffnode;
+}) huffnode;
 
 
-typedef struct
+typedef PACKED_STRUCT(
 {
     word RLEWtag;
     int32_t headeroffsets[100];
-} mapfiletype;
+}) mapfiletype;
 
 
 /*

id_ca.h

@@ -15,13 +15,13 @@
 
 //===========================================================================
 
-typedef struct
+typedef PACKED_STRUCT(
 {
     int32_t planestart[3];
     word    planelength[3];
     word    width,height;
     char    name[16];
-} maptype;
+}) maptype;
 
 //===========================================================================
 

id_us.h

@@ -21,12 +21,12 @@
 
 #define	MaxHighName	57
 #define	MaxScores	7
-typedef	struct
+typedef	PACKED_STRUCT(
 {
     char	name[MaxHighName + 1];
     int32_t	score;
     word	completed,episode;
-} HighScore;
+}) HighScore;
 
 #define	MaxGameName		32
 #define	MaxSaveGames	6

wl_def.h

@@ -25,7 +25,27 @@
 #	define O_BINARY 0
 #endif
 
-#pragma pack(1)
+#ifdef __WATCOMC__
+ #define PACKEDPREFIX _Packed
+#elif defined(_MSC_VER)
+ #define PACKEDPREFIX __pragma(pack(push,1))
+#else
+ #define PACKEDPREFIX
+#endif
+
+#ifdef __GNUC__
+ #if defined(_WIN32) && !defined(__clang__)
+  #define PACKEDSUFFIX __attribute__((packed,gcc_struct))
+ #else
+  #define PACKEDSUFFIX __attribute__((packed))
+ #endif
+#elif defined(_MSC_VER)
+  #define PACKEDSUFFIX __pragma(pack(pop))
+#else
+  #define PACKEDSUFFIX
+#endif
+
+#define PACKED_STRUCT(...) PACKEDPREFIX struct __VA_ARGS__ PACKEDSUFFIX
 
 #if defined(_arch_dreamcast)
 #define YESBUTTONNAME "A"
@@ -741,14 +761,14 @@ extern statetype states[numstates]; // [FG] statetype states[] array
 //
 //---------------------
 
-typedef struct statstruct
+typedef PACKED_STRUCT( statstruct
 {
     byte      tilex,tiley;
     short     shapenum;           // if shapenum == -1 the obj has been removed
     byte      *visspot;
     uint32_t  flags;
     byte      itemnumber;
-} statobj_t;
+}) statobj_t;
 
 
 //---------------------
@@ -762,14 +782,14 @@ typedef enum
     dr_open,dr_closed,dr_opening,dr_closing
 } doortype;
 
-typedef struct doorstruct
+typedef PACKED_STRUCT( doorstruct
 {
     byte     tilex,tiley;
     boolean  vertical;
     byte     lock;
     doortype action;
     short    ticcount;
-} doorobj_t;
+}) doorobj_t;
 
 
 //--------------------
@@ -778,7 +798,7 @@ typedef struct doorstruct
 //
 //--------------------
 
-typedef struct objstruct
+typedef PACKED_STRUCT( objstruct
 {
     activetype  active;
     short       ticcount;
@@ -804,7 +824,7 @@ typedef struct objstruct
 
     short       temp1,temp2,hidden;
     struct objstruct *next,*prev;
-} objtype;
+}) objtype;
 
 enum
 {
@@ -855,7 +875,7 @@ enum
 //
 //---------------
 
-typedef struct
+typedef PACKED_STRUCT(
 {
     short       difficulty;
     short       mapon;
@@ -874,7 +894,7 @@ typedef struct
     int32_t     TimeCount;
     int32_t     killx,killy;
     boolean     victoryflag;            // set during victory animations
-} gametype;
+}) gametype;
 
 
 typedef enum

wl_menu.h

@@ -229,10 +229,10 @@ enum menuitems
 //
 // WL_INTER
 //
-typedef struct {
+typedef PACKED_STRUCT( {
                 int kill,secret,treasure;
                 int32_t time;
-                } LRstruct;
+                }) LRstruct;
 
 extern LRstruct LevelRatios[];