Index: src/include/port/win32/sys/socket.h
===================================================================
RCS file: /projects/cvsroot/pgsql/src/include/port/win32/sys/socket.h,v
retrieving revision 1.2
diff -c -r1.2 socket.h
*** src/include/port/win32/sys/socket.h	4 Aug 2003 00:43:32 -0000	1.2
--- src/include/port/win32/sys/socket.h	25 Aug 2005 22:55:39 -0000
***************
*** 5,10 ****
--- 5,11 ----
   *
   * Note: Don't include <wingdi.h> directly.  It causes compile errors.
   */
+ #include <ws2tcpip.h>
  #include <winsock2.h>
  #undef ERROR
  #undef small
***************
*** 13,16 ****
--- 14,24 ----
  #ifdef PGERROR
  #define ERROR PGERROR
  
+ /* 
+  * we can't use the windows gai_strerror{AW} functions because
+  * they are defined inline in the MS header files. So we'll use our
+  * own
+  */
+ #undef gai_strerror
+ 
  #endif