diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-06-11 18:56:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-06-11 18:56:18 -0700 |
| commit | 788c787ea7bb80d1a9b29f210d9af9f4da5d4cdb (patch) | |
| tree | 642b3c66525f20fdfb2f2ffd4ab782188b43832f /indra | |
| parent | 5bf8c727c73c98310496be63e9c67a8124e80afe (diff) | |
Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with mac/linux and potentially improve EXT-7032 behavior.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/CARes.cmake | 1 | ||||
| -rw-r--r-- | indra/llmessage/llares.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake index 8a2dc01561..1850b706ac 100644 --- a/indra/cmake/CARes.cmake +++ b/indra/cmake/CARes.cmake @@ -9,6 +9,7 @@ if (STANDALONE) include(FindCARes) else (STANDALONE) use_prebuilt_binary(ares) + add_definitions("-DCARES_STATICLIB") if (WINDOWS) set(CARES_LIBRARIES areslib) elseif (DARWIN) diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index 00e77d20e9..78561b37aa 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -473,7 +473,7 @@ bool LLAres::process(U64 timeout) ll_init_apr(); } - int socks[ARES_GETSOCK_MAXNUM]; + ares_socket_t socks[ARES_GETSOCK_MAXNUM]; apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM]; apr_int32_t nsds = 0; int nactive = 0; |