diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2016-03-15 03:57:39 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2016-03-15 03:57:39 +0000 |
| commit | 26d978a556ae9099f6610ace9834991636e4a71b (patch) | |
| tree | d8789c5afbe3920f3f7ef46ad73aa34f48173591 /third_party/build/srtp/srtp_config.h | |
| parent | 8b9358503884ec1901d807ff56c2fc588be896a2 (diff) | |
Close #1847: Upgraded libsrtp version to 1.5.4 and added support for AES-CM-256 crypto.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5261 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party/build/srtp/srtp_config.h')
| -rw-r--r-- | third_party/build/srtp/srtp_config.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/third_party/build/srtp/srtp_config.h b/third_party/build/srtp/srtp_config.h index 5f708c8e..806bc8b8 100644 --- a/third_party/build/srtp/srtp_config.h +++ b/third_party/build/srtp/srtp_config.h @@ -137,11 +137,15 @@ # define inline _inline # 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 /* clock() */ @@ -220,6 +224,12 @@ /* Define to `unsigned' if <sys/types.h> does not define. */ /* #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__ */ |