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/srtp/crypto/include/integers.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/srtp/crypto/include/integers.h')
| -rw-r--r-- | third_party/srtp/crypto/include/integers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/srtp/crypto/include/integers.h b/third_party/srtp/crypto/include/integers.h index 138ea9c5..179ec39f 100644 --- a/third_party/srtp/crypto/include/integers.h +++ b/third_party/srtp/crypto/include/integers.h @@ -47,7 +47,7 @@ #ifndef INTEGERS_H #define INTEGERS_H -#include "srtp_config.h" /* configuration file, using autoconf */ +#include "config.h" #ifdef SRTP_KERNEL @@ -76,7 +76,7 @@ #endif /* Can we do 64 bit integers? */ -#ifndef HAVE_UINT64_T +#if !defined(HAVE_UINT64_T) # if SIZEOF_UNSIGNED_LONG == 8 typedef unsigned long uint64_t; # elif SIZEOF_UNSIGNED_LONG_LONG == 8 @@ -99,7 +99,7 @@ typedef unsigned int uint32_t; #endif -#ifdef NO_64BIT_MATH +#if defined(NO_64BIT_MATH) && defined(HAVE_CONFIG_H) typedef double uint64_t; /* assert that sizeof(double) == 8 */ extern uint64_t make64(uint32_t high, uint32_t low); |