summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-14 07:58:04 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-14 07:58:04 -0700
commit0a6761820e49d139c8e5068a82b32df84db5b611 (patch)
treeb995b4bd4c1cc4aaef25dbd1f63eb72cde7b748b /indra/llmessage
parent0022aff49d21f932f16fbd8131523ab47c56759f (diff)
parente96544ff266849207adfc3823adfc2dcfe42ce72 (diff)
Merged from viewer-release
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llares.cpp2
1 files changed, 1 insertions, 1 deletions
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;