From 3913a0571351246806c5f05989ed162f2ec5cb66 Mon Sep 17 00:00:00 2001
From: NY00123 <ny00@outlook.com>
Date: Tue, 14 Apr 2020 22:59:45 +0300
Subject: [PATCH] Use pragma pack in sw/src/network.h instead of the locally
 defined PACKED macro. This is more consistent with the current Duke3D
 codebase, and further fixes build with older versions of MinGW GCC, in which
 attribute packed is broken without specifying -mno-ms-bitfields.

---
 source/sw/src/network.h | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/source/sw/src/network.h b/source/sw/src/network.h
index 141eb4fbb..84a75444e 100644
--- a/source/sw/src/network.h
+++ b/source/sw/src/network.h
@@ -52,27 +52,16 @@ BEGIN_SW_NS
 #define SYNC_TEST TRUE
 #define MAXSYNCBYTES 16
 
-#ifdef __GNUC__
-# define PACKED __attribute__ ((packed))
-#else
-# define PACKED
-# ifdef _MSC_VER
-#  pragma pack(1)
-# endif
-# ifdef __WATCOMC__
-#  pragma pack(push,1);
-# endif
-#endif
-
+#pragma pack(push,1)
 // Slave->Master: PlayerIndex = who to send the packet to (-1 = all)
 // Master->Slave: PlayerIndex = who sent the packet originally
-typedef struct PACKED
+typedef struct
 {
     uint8_t PacketType;  // first byte is always packet type
     uint8_t PlayerIndex;
 } PACKET_PROXY,*PACKET_PROXYp;
 
-typedef struct PACKED
+typedef struct
 {
     uint8_t PacketType;  // first byte is always packet type
     uint8_t FirstPlayerIndex;
@@ -89,7 +78,7 @@ typedef struct PACKED
     SWBOOL Nuke;
 } PACKET_NEW_GAME,*PACKET_NEW_GAMEp;
 
-typedef struct PACKED
+typedef struct
 {
     uint8_t PacketType;  // first byte is always packet type
     SWBOOL AutoRun;
@@ -97,31 +86,24 @@ typedef struct PACKED
     char PlayerName[32];
 } PACKET_OPTIONS,*PACKET_OPTIONSp;
 
-typedef struct PACKED
+typedef struct
 {
     uint8_t PacketType;  // first byte is always packet type
     char PlayerName[32];
 } PACKET_NAME_CHANGE,*PACKET_NAME_CHANGEp;
 
-typedef struct PACKED
+typedef struct
 {
     uint8_t PacketType;  // first byte is always packet type
     uint8_t RTSnum;
 } PACKET_RTS,*PACKET_RTSp;
 
-typedef struct PACKED
+typedef struct
 {
     uint8_t PacketType;  // first byte is always packet type
     int Version;
 } PACKET_VERSION,*PACKET_VERSIONp;
-
-#undef PACKED
-#ifdef _MSC_VER
-# pragma pack()
-#endif
-#ifdef __WATCOMC__
-# pragma pack(pop);
-#endif
+#pragma pack(pop)
 
 extern uint8_t syncstat[MAXSYNCBYTES];
 extern SWBOOL PredictionOn;