| David 'Digit' Turner | f59fa74 | 2013-01-23 16:27:08 +0100 | [diff] [blame^] | 1 | diff --git a/openssl/crypto/bio/bss_dgram.c b/openssl/crypto/bio/bss_dgram.c |
| 2 | index 71ebe98..a6d882b 100644 |
| 3 | --- a/crypto/bio/bss_dgram.c |
| 4 | +++ b/crypto/bio/bss_dgram.c |
| 5 | @@ -378,7 +378,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) |
| 6 | bio_dgram_data *data = NULL; |
| 7 | #if defined(IP_MTU_DISCOVER) || defined(IP_MTU) |
| 8 | long sockopt_val = 0; |
| 9 | - unsigned int sockopt_len = 0; |
| 10 | + socklen_t sockopt_len = 0; |
| 11 | #endif |
| 12 | #ifdef OPENSSL_SYS_LINUX |
| 13 | socklen_t addr_len; |
| 14 | diff --git a/openssl/crypto/cryptlib.c b/openssl/crypto/cryptlib.c |
| 15 | index 387a987..5dfeec7 100644 |
| 16 | --- a/crypto/cryptlib.c |
| 17 | +++ b/crypto/cryptlib.c |
| 18 | @@ -500,7 +500,7 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id) |
| 19 | CRYPTO_THREADID_set_numeric(id, (unsigned long)find_thread(NULL)); |
| 20 | #else |
| 21 | /* For everything else, default to using the address of 'errno' */ |
| 22 | - CRYPTO_THREADID_set_pointer(id, &errno); |
| 23 | + CRYPTO_THREADID_set_pointer(id, (void*)&errno); |
| 24 | #endif |
| 25 | } |
| 26 | |