summaryrefslogtreecommitdiff
path: root/indra/llmessage/llares.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-06-14 14:48:50 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-06-14 14:48:50 +0300
commit5baaf1f8e7043ddc6ba1b3d302c272c2ef9b7451 (patch)
treea0c55dc2e0dc9e38b2dabfae0a497a517c013e35 /indra/llmessage/llares.cpp
parent0904b13cbb2b50a77a1ee34d40a7f5d76df148d3 (diff)
parente79b9d9bab9c18c05cccbff1ae5869377b303560 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llmessage/llares.cpp')
-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;