--- src/include/getaddrinfo.h.orig	Wed Jun 28 01:25:28 2006
+++ src/include/getaddrinfo.h	Wed Jun 28 13:42:57 2006
@@ -41,7 +41,9 @@
 #define EAI_SYSTEM		(-11)
 #else							/* WIN32 */
 #ifdef WIN32_ONLY_COMPILER
+#ifndef WSA_NOT_ENOUGH_MEMORY
 #define WSA_NOT_ENOUGH_MEMORY   (WSAENOBUFS)
+#endif
 #define WSATYPE_NOT_FOUND       (WSABASEERR+109)
 #endif
 #define EAI_AGAIN		WSATRY_AGAIN
@@ -89,6 +91,19 @@
 
 #ifndef HAVE_STRUCT_ADDRINFO
 
+#ifdef WIN32_ONLY_COMPILER
+struct addrinfo
+{
+	int			ai_flags;
+	int			ai_family;
+	int			ai_socktype;
+	int			ai_protocol;
+	size_t		ai_addrlen;
+	char	   *ai_canonname;
+	struct sockaddr *ai_addr;
+	struct addrinfo *ai_next;
+};
+#else
 struct addrinfo
 {
 	int			ai_flags;