Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-06-13 19:08:38 +02:00
commit fdd93fa85d

View file

@ -29,7 +29,9 @@
#ifdef G_OS_WIN32
/* ws2_32.dll has getaddrinfo and freeaddrinfo on Windows XP and later.
* minwg32 headers check WINVER before allowing the use of these */
#ifndef WINVER
#define WINVER 0x0501
#endif
#include <winsock2.h>
#include <ws2tcpip.h>
#ifndef socklen_t