From 69e50a0f77beb0731d7ad51527bcf01f523b58f1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 24 Jan 2006 16:38:50 +0000 Subject: [PATCH] Fix unportable usage of socklen_t: should use ACCEPT_TYPE_ARG3 macro provided by configure, instead. Per bug #2205. --- src/backend/libpq/pqcomm.c | 6 +++--- src/interfaces/libpq/fe-secure.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index a797f0f1b8..80638db0f6 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -1183,7 +1183,7 @@ pq_getkeepalivesidle(Port *port) if (port->default_keepalives_idle == 0) { - socklen_t size = sizeof(port->default_keepalives_idle); + ACCEPT_TYPE_ARG3 size = sizeof(port->default_keepalives_idle); if (getsockopt(port->sock, IPPROTO_TCP, TCP_KEEPIDLE, (char *) &port->default_keepalives_idle, @@ -1255,7 +1255,7 @@ pq_getkeepalivesinterval(Port *port) if (port->default_keepalives_interval == 0) { - socklen_t size = sizeof(port->default_keepalives_interval); + ACCEPT_TYPE_ARG3 size = sizeof(port->default_keepalives_interval); if (getsockopt(port->sock, IPPROTO_TCP, TCP_KEEPINTVL, (char *) &port->default_keepalives_interval, @@ -1327,7 +1327,7 @@ pq_getkeepalivescount(Port *port) if (port->default_keepalives_count == 0) { - socklen_t size = sizeof(port->default_keepalives_count); + ACCEPT_TYPE_ARG3 size = sizeof(port->default_keepalives_count); if (getsockopt(port->sock, IPPROTO_TCP, TCP_KEEPCNT, (char *) &port->default_keepalives_count, diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index e2762d6479..2c646b6d7c 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -527,7 +527,7 @@ verify_peer(PGconn *conn) struct hostent *h = NULL; struct sockaddr addr; struct sockaddr_in *sin; - socklen_t len; + ACCEPT_TYPE_ARG3 len; char **s; unsigned long l; -- 2.39.5