diff options
| author | David Caldwell <david@porkrind.org> | 2017-04-05 11:15:45 -0700 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-04-06 12:36:22 +0200 |
| commit | 5659d09e3760c8d1986ba9852204c6942bc7d510 (patch) | |
| tree | ea67100eb682f623c2c5e7b798fd10f7153892a1 /lib/cipher.c | |
| parent | 27a049382d20359dc1689d826b7975f47f6d988e (diff) | |
| download | gnutls-5659d09e3760c8d1986ba9852204c6942bc7d510.tar.gz | |
Rename uint64 to gnutls_uint64 to avoid conflict with macOS
Signed-off-by: David Caldwell <david@porkrind.org>
Diffstat (limited to 'lib/cipher.c')
| -rw-r--r-- | lib/cipher.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/cipher.c b/lib/cipher.c index 800104d9ca..acb6b39623 100644 --- a/lib/cipher.c +++ b/lib/cipher.c @@ -53,7 +53,7 @@ static int ciphertext_to_compressed(gnutls_session_t session, gnutls_datum_t * compressed, uint8_t type, record_parameters_st * params, - uint64 * sequence); + gnutls_uint64 * sequence); inline static int is_write_comp_null(record_parameters_st * record_params) { @@ -151,7 +151,7 @@ _gnutls_decrypt(gnutls_session_t session, gnutls_datum_t * ciphertext, gnutls_datum_t * output, content_type_t type, - record_parameters_st * params, uint64 * sequence) + record_parameters_st * params, gnutls_uint64 * sequence) { int ret; @@ -499,7 +499,7 @@ ciphertext_to_compressed(gnutls_session_t session, gnutls_datum_t * ciphertext, gnutls_datum_t * compressed, uint8_t type, record_parameters_st * params, - uint64 * sequence) + gnutls_uint64 * sequence) { uint8_t tag[MAX_HASH_SIZE]; uint8_t nonce[MAX_CIPHER_BLOCK_SIZE]; |