Move TCP keepalive macro definition

bmomjian · bmomjian · commit 45d9d90c83a5 · 2010-03-13T15:35:46.000Z
Jaime Casanova
diff --git 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.205 2010/02/26 02:00:43 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.206 2010/03/13 15:35:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1418,10 +1418,10 @@ pq_getkeepalivesinterval(Port *port)
 int
 pq_setkeepalivesinterval(int interval, Port *port)
 {
+#ifdef TCP_KEEPINTVL
 	if (port == NULL || IS_AF_UNIX(port->laddr.addr.ss_family))
 		return STATUS_OK;
 
-#ifdef TCP_KEEPINTVL
 	if (interval == port->keepalives_interval)
 		return STATUS_OK;
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`31`	`31`	`* Portions Copyright (c) 1994, Regents of the University of California`
`32`	`32`	`*`
`33`		`- * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.205 2010/02/26 02:00:43 momjian Exp $`
	`33`	`+ * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.206 2010/03/13 15:35:46 momjian Exp $`
`34`	`34`	`*`
`35`	`35`	`*-------------------------------------------------------------------------`
`36`	`36`	`*/`
`@@ -1418,10 +1418,10 @@ pq_getkeepalivesinterval(Port *port)`
`1418`	`1418`	`int`
`1419`	`1419`	`pq_setkeepalivesinterval(int interval, Port *port)`
`1420`	`1420`	`{`
	`1421`	`+#ifdef TCP_KEEPINTVL`
`1421`	`1422`	`if (port == NULL \|\| IS_AF_UNIX(port->laddr.addr.ss_family))`
`1422`	`1423`	`return STATUS_OK;`
`1423`	`1424`
`1424`		`-#ifdef TCP_KEEPINTVL`
`1425`	`1425`	`if (interval == port->keepalives_interval)`
`1426`	`1426`	`return STATUS_OK;`
`1427`	`1427`