Mercurial > pidgin
diff libpurple/protocols/gg/lib/handlers.c @ 32672:3828a61c44da
A boring and large patch so I can merge heads.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 23 Dec 2011 08:21:58 +0000 |
parents | 3a90a59ddea2 |
children |
line wrap: on
line diff
--- a/libpurple/protocols/gg/lib/handlers.c Mon Aug 22 22:46:08 2011 +0000 +++ b/libpurple/protocols/gg/lib/handlers.c Fri Dec 23 08:21:58 2011 +0000 @@ -27,21 +27,13 @@ */ #include <sys/types.h> -#ifndef _WIN32 -# include <sys/socket.h> -# include <netinet/in.h> -# include <arpa/inet.h> -#endif #include <ctype.h> -#ifndef _WIN32 -# ifdef sun -# include <sys/filio.h> -# endif +#ifdef sun +# include <sys/filio.h> #endif #include "compat.h" #include "libgadu.h" -#include "libgadu-config.h" #include "resolver.h" #include "session.h" #include "protocol.h" @@ -51,9 +43,6 @@ #include "deflate.h" #include <errno.h> -#ifndef _WIN32 -# include <netdb.h> -#endif #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -92,7 +81,7 @@ uint8_t hash_buf[64]; uint32_t local_ip; struct sockaddr_in sin; - unsigned int sin_len = sizeof(sin); + socklen_t sin_len = sizeof(sin); if (len < sizeof(struct gg_welcome)) { ge->type = GG_EVENT_CONN_FAILED;