From: Jonathan L. <jon...@us...> - 2010-06-15 20:56:18
|
Update of /cvsroot/srtp/srtp/include In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5327/include Modified Files: srtp.h Log Message: Remove #pragma pack() calls for MSC. It looks like it was added for the bit-packed structures, but not moved when srtp_priv.h was split out. Correct packing of bit-packed structures is now resolved differently for Microsoft C. With the previous code, it could result in the structures defined in crypto_kernel.h and its includes being compiled with inconsistent packing, depending on the order in which header files are included in C files. Index: srtp.h =================================================================== RCS file: /cvsroot/srtp/srtp/include/srtp.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** srtp.h 20 May 2010 20:55:54 -0000 1.22 --- srtp.h 15 Jun 2010 20:56:10 -0000 1.23 *************** *** 51,58 **** #endif - #ifdef _MSC_VER - #pragma pack(4) - #endif - #include "crypto_kernel.h" --- 51,54 ---- *************** *** 1004,1011 **** #define SRTCP_INDEX_MASK 0x7fffffff - #ifdef _MSC_VER - #pragma pack() - #endif - #ifdef __cplusplus } --- 1000,1003 ---- |