From 8226d9807819dbbc4b05751f4cdd09603832367d Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Fri, 9 Jul 2010 14:44:21 +0000 Subject: [PATCH] Fixed compile warnings under windows --- src/util/network.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/util/network.c b/src/util/network.c index 101e794d0..2d59b46dd 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -175,10 +175,15 @@ socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle *h) static void socket_set_nodelay (const struct GNUNET_NETWORK_Handle *h) { +#ifndef WINDOWS int value = 1; - if (0 != - setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof (value))) + if (0 != setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof (value))) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt"); +#else + const char * value = "1"; + if (0 != setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, value, sizeof (value))) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt"); +#endif } @@ -411,13 +416,14 @@ GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc) { int error; - int pending; /* How much is there to be read? */ #ifndef WINDOWS + int pending; error = ioctl (desc->fd, FIONREAD, &pending); if (error == 0) #else + u_long pending; error = ioctlsocket (desc->fd, FIONREAD, &pending); if (error != SOCKET_ERROR) #endif @@ -876,7 +882,7 @@ GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1, { HANDLE *h; - h = GNUNET_CONTAINER_slist_get (it, NULL); + h = (HANDLE *) GNUNET_CONTAINER_slist_get ((const struct GNUNET_CONTAINER_SList_Iterator *)it, NULL); if (GNUNET_CONTAINER_slist_contains (fds2->handles, h, sizeof (HANDLE))) { -- 2.25.1