| OLD | NEW |
|---|
| (Empty) | |
| 1 diff --git a/README.chromium b/README.chromium |
| 2 index ae335ca..9962738 100644 |
| 3 --- a/README.chromium |
| 4 +++ b/README.chromium |
| 5 @@ -96,3 +96,5 @@ Android platform support |
| 6 |
| 7 Copy config/android/openssl/opensslconf.h from Android's |
| 8 external/openssl/include/openssl/opensslconf.h |
| 9 + |
| 10 +Fix warnings when building with clang |
| 11 diff --git a/openssl/crypto/bio/bss_dgram.c b/openssl/crypto/bio/bss_dgram.c |
| 12 index 71ebe98..a6d882b 100644 |
| 13 --- a/openssl/crypto/bio/bss_dgram.c |
| 14 +++ b/openssl/crypto/bio/bss_dgram.c |
| 15 @@ -378,7 +378,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) |
| 16 bio_dgram_data *data = NULL; |
| 17 #if defined(IP_MTU_DISCOVER) || defined(IP_MTU) |
| 18 long sockopt_val = 0; |
| 19 - unsigned int sockopt_len = 0; |
| 20 + socklen_t sockopt_len = 0; |
| 21 #endif |
| 22 #ifdef OPENSSL_SYS_LINUX |
| 23 socklen_t addr_len; |
| 24 diff --git a/openssl/crypto/cryptlib.c b/openssl/crypto/cryptlib.c |
| 25 index 387a987..5dfeec7 100644 |
| 26 --- a/openssl/crypto/cryptlib.c |
| 27 +++ b/openssl/crypto/cryptlib.c |
| 28 @@ -500,7 +500,7 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id) |
| 29 CRYPTO_THREADID_set_numeric(id, (unsigned long)find_thread(NULL)); |
| 30 #else |
| 31 /* For everything else, default to using the address of 'errno' */ |
| 32 - CRYPTO_THREADID_set_pointer(id, &errno); |
| 33 + CRYPTO_THREADID_set_pointer(id, (void*)&errno); |
| 34 #endif |
| 35 } |
| 36 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10911247:
Upstream openssl to version 1.0.1c (Closed)
Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/