Mercurial > pidgin
diff libpurple/protocols/gg/lib/events.c @ 29539:db6735e579f8
Partially fix libgadu build on Win32. Refs #10542. I'm still not sure how to
handle all the stuff in resolver.c for DNS resolution. I couldn't quite see how
to reconcile our earlier stuff with this new code. Hopefully a more skilled
Win32 developer can finish this.
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Mon, 22 Feb 2010 00:36:15 +0000 |
parents | 6359fde67f4c |
children | 818f2845ab47 |
line wrap: on
line diff
--- a/libpurple/protocols/gg/lib/events.c Sun Feb 21 16:52:42 2010 +0000 +++ b/libpurple/protocols/gg/lib/events.c Mon Feb 22 00:36:15 2010 +0000 @@ -27,16 +27,20 @@ * \brief Obsługa zdarzeń */ +#include "libgadu.h" +#include "libgadu-internal.h" + #include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> + +#ifndef _WIN32 +# include <sys/ioctl.h> +# include <sys/socket.h> +# include <netinet/in.h> +# include <arpa/inet.h> +#endif #include "compat.h" -#include "libgadu.h" #include "protocol.h" -#include "libgadu-internal.h" #include <errno.h> #include <stdio.h> @@ -1534,7 +1538,7 @@ { char buf[1024], *client, *auth; int res = 0; - unsigned int res_size = sizeof(res); + socklen_t res_size = sizeof(res); const char *host; gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTING_HUB\n"); @@ -1752,7 +1756,7 @@ case GG_STATE_CONNECTING_GG: { int res = 0; - unsigned int res_size = sizeof(res); + socklen_t res_size = sizeof(res); gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTING_GG\n"); @@ -2054,7 +2058,7 @@ if (gg_dcc_ip == (unsigned long) inet_addr("255.255.255.255")) { struct sockaddr_in sin; - unsigned int sin_len = sizeof(sin); + socklen_t sin_len = sizeof(sin); gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() detecting address\n");