--- src/include/port/win32.h.orig	Mon May  8 14:45:11 2006
+++ src/include/port/win32.h	Mon May  8 15:15:09 2006
@@ -1,5 +1,8 @@
 /* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.51 2006/03/03 20:52:36 momjian Exp $ */
 
+#ifndef _PORT_WIN32_H
+#define _PORT_WIN32_H
+
 /* undefine and redefine after #include */
 #undef mkdir
 
@@ -11,6 +14,7 @@
 #include <errno.h>
 
 #undef near
+#define near pg_near
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -256,3 +260,5 @@
 
 /* in backend/port/win32/error.c */
 extern void _dosmaperr(unsigned long);
+
+#endif /* _PORT_WIN32_H */
--- src/include/getaddrinfo.h.orig	Mon May  8 14:35:41 2006
+++ src/include/getaddrinfo.h	Mon May  8 14:36:54 2006
@@ -43,7 +43,9 @@
 #define EAI_SYSTEM		(-11)
 #else							/* WIN32 */
 #if defined(WIN32_CLIENT_ONLY)
+#ifndef WSA_NOT_ENOUGH_MEMORY
 #define WSA_NOT_ENOUGH_MEMORY   (WSAENOBUFS)
+#endif
 #define WSATYPE_NOT_FOUND       (WSABASEERR+109)
 #endif
 #define EAI_AGAIN		WSATRY_AGAIN