Changeset 2660 for pjproject/trunk/third_party/srtp/include/srtp_priv.h

Timestamp:

Apr 28, 2009 7:38:43 PM (15 years ago)

Author:

nanang

Message:

Ticket #706: Merged branch vs-reorg2 into trunk:

• Currently supported platforms are: Win32, WM6 std & pro, WM5 SP & PPC, WM2003 SP & PPC.
• Added libpjproject into solution, this is a single 'combo' library that bundles all PJSIP libraries.
• Cleaned up most of compile warnings, note that warning level of libgsmcodec has been reduced from 4 to 3.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• third_party/srtp/include/srtp_priv.h (modified) (4 diffs)

pjproject/trunk/third_party/srtp/include/srtp_priv.h

@@ -60 +60 @@
  */
  
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning(disable:4214) // bit field types other than int
+#endif
+
 #ifndef WORDS_BIGENDIAN
 
@@ -68 +73 @@
  * fully pack the bit fields.
  */
-
 typedef struct {
   unsigned char cc:4;   /* CSRC count             */
@@ -97 +101 @@
 #endif
 
+
 typedef struct {
   uint16_t profile_specific;    /* profile-specific info               */
@@ -155 +160 @@
 } srtcp_trailer_t;
 
+#endif
+
+
+#ifdef _MSC_VER
+#   pragma warning( pop ) 
 #endif