diff options
author | David 'Digit' Turner <digit@android.com> | 2013-01-23 16:27:08 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2013-01-23 16:27:08 +0100 |
commit | f59fa7445dbf3eebabb2ff5875559d636f6834f0 (patch) | |
tree | 763be1381a92e5a7a3a33efd4ddc751c8fa476c5 /crypto | |
parent | 410afec19da6b0be40734be660ad6c4395ee827b (diff) | |
download | replicant_openssl-f59fa7445dbf3eebabb2ff5875559d636f6834f0.zip replicant_openssl-f59fa7445dbf3eebabb2ff5875559d636f6834f0.tar.gz replicant_openssl-f59fa7445dbf3eebabb2ff5875559d636f6834f0.tar.bz2 |
Add patches/clang.patch to fix two minor Clang compiler errors.
This patch is currently applied on top of the Android ones for the
Chromium version of the library. Applying it here helps reduce the
difference between them.
Change-Id: I089dc7e56f0de49906f1bc582e1f3278b4aee2e6
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/bio/bss_dgram.c | 2 | ||||
-rw-r--r-- | crypto/cryptlib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 1b1e4be..3c66dd1 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -447,7 +447,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) bio_dgram_data *data = NULL; #if defined(IP_MTU_DISCOVER) || defined(IP_MTU) long sockopt_val = 0; - unsigned int sockopt_len = 0; + socklen_t sockopt_len = 0; #endif #ifdef OPENSSL_SYS_LINUX socklen_t addr_len; diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 766ea8c..50fd492 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -504,7 +504,7 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id) CRYPTO_THREADID_set_numeric(id, (unsigned long)find_thread(NULL)); #else /* For everything else, default to using the address of 'errno' */ - CRYPTO_THREADID_set_pointer(id, &errno); + CRYPTO_THREADID_set_pointer(id, (void*)&errno); #endif } |