ares.h: there is no ares_free_soa function

[platform/upstream/c-ares.git] / ares_getsock.c

diff --git a/ares_getsock.c b/ares_getsock.c
index 38b8fef..07d2854 100644 (file)
--- a/ares_getsock.c
+++ b/ares_getsock.c
@@ -1,6 +1,5 @@
-/* $Id$ */
 
-/* Copyright (C) 2005 - 2007, Daniel Stenberg
+/* Copyright (C) 2005 - 2010, Daniel Stenberg
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose and without fee is hereby granted, provided
@@ -13,17 +12,13 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
+#include "ares_setup.h"
 
 #include "ares.h"
 #include "ares_private.h"
 
 int ares_getsock(ares_channel channel,
-                 int *s,
+                 ares_socket_t *socks,
                  int numsocks) /* size of the 'socks' array */
 {
   struct server_state *server;
@@ -32,8 +27,6 @@ int ares_getsock(ares_channel channel,
   int bitmap = 0;
   unsigned int setbits = 0xffffffff;
 
-  ares_socket_t *socks = (ares_socket_t *)s;
-
   /* Are there any active queries? */
   int active_queries = !ares__is_list_empty(&(channel->all_queries));