From: Christian Grothoff Date: Tue, 11 May 2010 11:50:53 +0000 (+0000) Subject: stuff X-Git-Tag: initial-import-from-subversion-38251~21777 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c9b7c04b1c4d6fc15225b5ba860b6e49c707ea6a;p=oweals%2Fgnunet.git stuff --- diff --git a/src/util/network.c b/src/util/network.c index e7a276422..c4fb73049 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -406,14 +406,12 @@ GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc, #ifdef MSG_DONTWAIT flags |= MSG_DONTWAIT; -#endif /* */ +#endif ret = recvfrom (desc->fd, buffer, length, flags, src_addr, addrlen); - #ifdef MINGW if (SOCKET_ERROR == ret) SetErrnoFromWinsockError (WSAGetLastError ()); - -#endif /* */ +#endif return ret; } @@ -434,15 +432,12 @@ GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc, #ifdef MSG_DONTWAIT flags |= MSG_DONTWAIT; - -#endif /* */ +#endif ret = recv (desc->fd, buffer, length, flags); - #ifdef MINGW if (SOCKET_ERROR == ret) SetErrnoFromWinsockError (WSAGetLastError ()); - -#endif /* */ +#endif return ret; } diff --git a/src/util/service.c b/src/util/service.c index ba2db383c..2c2e7d8df 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -1014,7 +1014,6 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, #endif ((struct sockaddr_in *) saddrs[1])->sin_family = AF_INET; ((struct sockaddr_in *) saddrs[1])->sin_port = htons (port); - } } *addrs = saddrs;