From: <sv...@ww...> - 2004-05-29 21:43:39
|
Author: wolverine Date: 2004-05-29 14:43:33 -0700 (Sat, 29 May 2004) New Revision: 977 Modified: trunk/CSP/CSPSim/Include/Networking.h Log: Using same packing on both linux and windows Modified: trunk/CSP/CSPSim/Include/Networking.h =================================================================== --- trunk/CSP/CSPSim/Include/Networking.h 2004-05-29 21:42:38 UTC (rev 976) +++ trunk/CSP/CSPSim/Include/Networking.h 2004-05-29 21:43:33 UTC (rev 977) @@ -47,10 +47,9 @@ const short NETWORK_PACKET_SIZE = 512; -#ifdef WIN32 -#pragma pack(push) -#pragma pack(1) -#endif +//#ifdef WIN32 +#pragma pack(push, 1) +//#endif // Define some structs that will only used for data transfers. @@ -178,9 +177,9 @@ }; -#ifdef WIN32 +//#ifdef WIN32 #pragma pack(pop) -#endif +//#endif class NetworkMessagePool { |