summaryrefslogtreecommitdiff
path: root/ares/ares_fds.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-07-22 22:18:45 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-07-22 22:18:45 +0000
commitc85bf83e880d9f92030cd0f6dc219e504c2fc774 (patch)
treebbb7aa6a2618a25db4c6cfcef38beb36ebe84316 /ares/ares_fds.c
parent060b6ce1481d523d93532e07b4b924597d838c5c (diff)
downloadcurl-c85bf83e880d9f92030cd0f6dc219e504c2fc774.tar.gz
- Fixed a few variable return types for some system calls. Made configure
check for ssize_t to make it possible to use that when receiving the send() error code. This is necessary to prevent compiler warnings on some systems. - Made configure create config.h, and all source files now include setup.h that might include the proper config.h (or a handicrafted alternative). - Switched to 'ares_socket_t' type for sockets in ares, since Windows don't use 'int' for that. - automake-ified and libool-ified c-ares. Now it builds libcares as a shared lib on most platforms if wanted. (This bloated the size of the release archive with another 200K!) - Makefile.am now uses Makefile.inc for the c sources, h headers and man pages, to make it easier for other makefiles to use the exact same set of files. - Adjusted 'maketgz' to use the new automake magic when building distribution archives.
Diffstat (limited to 'ares/ares_fds.c')
-rw-r--r--ares/ares_fds.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ares/ares_fds.c b/ares/ares_fds.c
index 73fc6c99e..6bb6ccee4 100644
--- a/ares/ares_fds.c
+++ b/ares/ares_fds.c
@@ -13,6 +13,7 @@
* without express or implied warranty.
*/
+#include "setup.h"
#include <sys/types.h>
#ifdef WIN32
@@ -37,13 +38,13 @@ int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
for (i = 0; i < channel->nservers; i++)
{
server = &channel->servers[i];
- if (server->udp_socket != -1)
+ if (server->udp_socket != ARES_SOCKET_BAD)
{
FD_SET(server->udp_socket, read_fds);
if (server->udp_socket >= nfds)
nfds = server->udp_socket + 1;
}
- if (server->tcp_socket != -1)
+ if (server->tcp_socket != ARES_SOCKET_BAD)
{
FD_SET(server->tcp_socket, read_fds);
if (server->qhead)