aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2010-03-13 16:40:38 +0000
committerBruce Momjian <bruce@momjian.us>2010-03-13 16:40:38 +0000
commit3f10d21ecddd8af06bfc6d458f5c9fa092730bc0 (patch)
tree8ab4b3b9aa8193b212479735214bae61f16be0fd
parent45d9d90c83a577a1b241369ccc1a49243619d14c (diff)
downloadpostgresql-3f10d21ecddd8af06bfc6d458f5c9fa092730bc0.tar.gz
postgresql-3f10d21ecddd8af06bfc6d458f5c9fa092730bc0.zip
Move more tcp keepalive macros to be consistent.
-rw-r--r--src/backend/libpq/pqcomm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 71f9928782f..a5c3af3f1db 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -30,7 +30,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.206 2010/03/13 15:35:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.207 2010/03/13 16:40:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1346,10 +1346,10 @@ pq_getkeepalivesidle(Port *port)
int
pq_setkeepalivesidle(int idle, Port *port)
{
+#ifdef TCP_KEEPIDLE
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK;
-#ifdef TCP_KEEPIDLE
if (idle == port->keepalives_idle)
return STATUS_OK;
@@ -1490,10 +1490,10 @@ pq_getkeepalivescount(Port *port)
int
pq_setkeepalivescount(int count, Port *port)
{
+#ifdef TCP_KEEPCNT
if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
return STATUS_OK;
-#ifdef TCP_KEEPCNT
if (count == port->keepalives_count)
return STATUS_OK;