summaryrefslogtreecommitdiff
path: root/third_party/srtp/include/srtp_priv.h
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/srtp/include/srtp_priv.h')
-rw-r--r--third_party/srtp/include/srtp_priv.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/third_party/srtp/include/srtp_priv.h b/third_party/srtp/include/srtp_priv.h
index de273ab3..9214a650 100644
--- a/third_party/srtp/include/srtp_priv.h
+++ b/third_party/srtp/include/srtp_priv.h
@@ -59,6 +59,11 @@
* is not identical)
*/
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4214) // bit field types other than int
+#endif
+
#ifndef WORDS_BIGENDIAN
/*
@@ -67,7 +72,6 @@
* "unsigned char", but doing so causes the MS compiler to not
* fully pack the bit fields.
*/
-
typedef struct {
unsigned char cc:4; /* CSRC count */
unsigned char x:1; /* header extension flag */
@@ -95,6 +99,7 @@ typedef struct {
} srtp_hdr_t;
#endif
+
typedef struct {
uint16_t profile_specific; /* profile-specific info */
@@ -157,6 +162,11 @@ typedef struct {
#endif
+#ifdef _MSC_VER
+# pragma warning( pop )
+#endif
+
+
/*
* the following declarations are libSRTP internal functions
*/