Index: src/bin/pg_config/win32.mak
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_config/win32.mak,v
retrieving revision 1.3
diff -c -c -r1.3 win32.mak
*** src/bin/pg_config/win32.mak	27 Sep 2005 17:39:33 -0000	1.3
--- src/bin/pg_config/win32.mak	8 Dec 2005 17:47:49 -0000
***************
*** 55,61 ****
  
  LINK32=link.exe
  LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
!  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
   odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
   /pdb:"$(OUTDIR)\pg_config.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_config.exe" 
  LINK32_OBJS= \
--- 55,61 ----
  
  LINK32=link.exe
  LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
!  advapi32.lib shell32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
   odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
   /pdb:"$(OUTDIR)\pg_config.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_config.exe" 
  LINK32_OBJS= \
Index: src/include/getaddrinfo.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/getaddrinfo.h,v
retrieving revision 1.17
diff -c -c -r1.17 getaddrinfo.h
*** src/include/getaddrinfo.h	15 Oct 2005 02:49:41 -0000	1.17
--- src/include/getaddrinfo.h	8 Dec 2005 17:47:49 -0000
***************
*** 42,47 ****
--- 42,51 ----
  #define EAI_MEMORY		(-10)
  #define EAI_SYSTEM		(-11)
  #else							/* WIN32 */
+ #if defined(WIN32_CLIENT_ONLY)
+ #define WSA_NOT_ENOUGH_MEMORY   (WSAENOBUFS)
+ #define WSATYPE_NOT_FOUND       (WSABASEERR+109)
+ #endif
  #define EAI_AGAIN		WSATRY_AGAIN
  #define EAI_BADFLAGS	WSAEINVAL
  #define EAI_FAIL		WSANO_RECOVERY
Index: src/port/getaddrinfo.c
===================================================================
RCS file: /cvsroot/pgsql/src/port/getaddrinfo.c,v
retrieving revision 1.21
diff -c -c -r1.21 getaddrinfo.c
*** src/port/getaddrinfo.c	15 Oct 2005 02:49:51 -0000	1.21
--- src/port/getaddrinfo.c	8 Dec 2005 17:47:50 -0000
***************
*** 40,45 ****
--- 40,46 ----
  
  #include <windows.h>
  
+ #if !defined(WIN32_CLIENT_ONLY)
  /*
   * The native routines may or may not exist on the Windows platform we are on,
   * so we dynamically look up the routines, and call them via function pointers.
***************
*** 129,134 ****
--- 130,136 ----
  	return (getaddrinfo_ptr != NULL);
  }
  #endif
+ #endif
  
  
  /*
***************
*** 149,155 ****
  			   *psin;
  	struct addrinfo hints;
  
! #ifdef WIN32
  
  	/*
  	 * If Windows has native IPv6 support, use the native Windows routine.
--- 151,157 ----
  			   *psin;
  	struct addrinfo hints;
  
! #if defined(WIN32) && !defined(WIN32_CLIENT_ONLY)
  
  	/*
  	 * If Windows has native IPv6 support, use the native Windows routine.
***************
*** 272,278 ****
  {
  	if (res)
  	{
! #ifdef WIN32
  
  		/*
  		 * If Windows has native IPv6 support, use the native Windows routine.
--- 274,280 ----
  {
  	if (res)
  	{
! #if defined(WIN32) && !defined(WIN32_CLIENT_ONLY)
  
  		/*
  		 * If Windows has native IPv6 support, use the native Windows routine.
***************
*** 364,370 ****
  			char *node, int nodelen,
  			char *service, int servicelen, int flags)
  {
! #ifdef WIN32
  
  	/*
  	 * If Windows has native IPv6 support, use the native Windows routine.
--- 366,372 ----
  			char *node, int nodelen,
  			char *service, int servicelen, int flags)
  {
! #if defined(WIN32) && !defined(WIN32_CLIENT_ONLY)
  
  	/*
  	 * If Windows has native IPv6 support, use the native Windows routine.