Changeset 5512 for pjproject/branches/projects/uwp/third_party/build/srtp/srtp_config.h

Timestamp:

Dec 28, 2016 3:28:05 AM (7 years ago)

Author:

nanang

Message:

Re #1900: Merged from trunk (without 3 text conflicts in sln & vcxproj).

Location:

pjproject/branches/projects/uwp/third_party

Files:

• . (modified) (1 prop)
• build/srtp/srtp_config.h (modified) (2 diffs)

pjproject/branches/projects/uwp/third_party/build/srtp/srtp_config.h

@@ -138 +138 @@
 #   endif
 
-#   pragma warning(disable:4311)
-#   pragma warning(disable:4761) // integral mismatch
-#   pragma warning(disable:4018) // signed/unsigned mismatch
+//#   pragma warning(disable:4311)
+//#   pragma warning(disable:4761) // integral mismatch
+//#   pragma warning(disable:4018) // signed/unsigned mismatch
 #   pragma warning(disable:4244) // conversion from int64 to int
 #   pragma warning(disable:4100) // unreferenced formal parameter
+#   pragma warning(disable:4214) // bit field types other than int
+#   pragma warning(disable:4389) // '!=' : signed/unsigned mismatch
+#   pragma warning(disable:4701) // potentially uninitialized local variable used
+#   pragma warning(disable:4702) // unreachable code
 #endif
 
@@ -221 +225 @@
 /* #undef size_t */
 
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libsrtp 1.5.4"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.5.4"
+
 
 #endif  /* __SRTP_CONFIG_H__ */