Index: src/backend/libpq/pqcomm.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v
retrieving revision 1.208
diff -c -c -r1.208 pqcomm.c
*** src/backend/libpq/pqcomm.c	13 Mar 2010 16:56:37 -0000	1.208
--- src/backend/libpq/pqcomm.c	13 Mar 2010 17:01:14 -0000
***************
*** 1317,1326 ****
  int
  pq_getkeepalivesidle(Port *port)
  {
- #ifdef TCP_KEEPIDLE
  	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
  		return 0;
  
  	if (port->keepalives_idle != 0)
  		return port->keepalives_idle;
  
--- 1317,1326 ----
  int
  pq_getkeepalivesidle(Port *port)
  {
  	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
  		return 0;
  
+ #ifdef TCP_KEEPIDLE
  	if (port->keepalives_idle != 0)
  		return port->keepalives_idle;
  
***************
*** 1389,1398 ****
  int
  pq_getkeepalivesinterval(Port *port)
  {
- #ifdef TCP_KEEPINTVL
  	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
  		return 0;
  
  	if (port->keepalives_interval != 0)
  		return port->keepalives_interval;
  
--- 1389,1398 ----
  int
  pq_getkeepalivesinterval(Port *port)
  {
  	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
  		return 0;
  
+ #ifdef TCP_KEEPINTVL
  	if (port->keepalives_interval != 0)
  		return port->keepalives_interval;
  
***************
*** 1461,1470 ****
  int
  pq_getkeepalivescount(Port *port)
  {
- #ifdef TCP_KEEPCNT
  	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
  		return 0;
  
  	if (port->keepalives_count != 0)
  		return port->keepalives_count;
  
--- 1461,1470 ----
  int
  pq_getkeepalivescount(Port *port)
  {
  	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
  		return 0;
  
+ #ifdef TCP_KEEPCNT
  	if (port->keepalives_count != 0)
  		return port->keepalives_count;