Index: src/include/port/win32.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/win32.h,v
retrieving revision 1.40
diff -c -c -r1.40 win32.h
*** src/include/port/win32.h	17 Nov 2004 00:14:14 -0000	1.40
--- src/include/port/win32.h	1 Dec 2004 23:39:13 -0000
***************
*** 210,215 ****
--- 210,219 ----
  #endif
  typedef long key_t;
  
+ #ifdef WIN32_CLIENT_ONLY
+ typedef int pid_t;
+ #endif
+ 
  /*
   * Supplement to <sys/stat.h>.
   */
Index: src/interfaces/libpq/fe-connect.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v
retrieving revision 1.289
diff -c -c -r1.289 fe-connect.c
*** src/interfaces/libpq/fe-connect.c	30 Oct 2004 23:11:26 -0000	1.289
--- src/interfaces/libpq/fe-connect.c	1 Dec 2004 23:39:19 -0000
***************
*** 20,26 ****
--- 20,28 ----
  #include <fcntl.h>
  #include <ctype.h>
  #include <time.h>
+ #ifndef WIN32_CLIENT_ONLY
  #include <unistd.h>
+ #endif
  
  #ifndef HAVE_STRDUP
  #include "strdup.h"
***************
*** 35,41 ****
  #include "win32.h"
  #else
  #include <sys/socket.h>
- #include <unistd.h>
  #include <netdb.h>
  #include <netinet/in.h>
  #ifdef HAVE_NETINET_TCP_H
--- 37,42 ----