NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit7a9d197

committed

Fix unportable usage of socklen_t: should use ACCEPT_TYPE_ARG3 macro

provided by configure, instead. Per bug #2205.

1 parent69f9fab commit7a9d197Copy full SHA for 7a9d197

File tree

2 files changed

-6

lines changed

src
- backend/libpq
  - pqcomm.c
- interfaces/libpq
  - fe-secure.c

2 files changed

-6

lines changed

`‎src/backend/libpq/pqcomm.c‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`* Portions Copyright (c) 1996-2005, 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.182 2005/10/17 16:24:19 tgl Exp $`
	`33`	`+ *$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.183 2006/01/24 16:38:42 tgl Exp $`
`34`	`34`	`*`
`35`	`35`	`*-------------------------------------------------------------------------`
`36`	`36`	`*/`
`@@ -1183,7 +1183,7 @@ pq_getkeepalivesidle(Port *port)`
`1183`	`1183`
`1184`	`1184`	`if (port->default_keepalives_idle==0)`
`1185`	`1185`	`{`
`1186`		`-socklen_tsize=sizeof(port->default_keepalives_idle);`
	`1186`	`+ACCEPT_TYPE_ARG3size=sizeof(port->default_keepalives_idle);`
`1187`	`1187`
`1188`	`1188`	`if (getsockopt(port->sock,IPPROTO_TCP,TCP_KEEPIDLE,`
`1189`	`1189`	`(char*)&port->default_keepalives_idle,`
`@@ -1255,7 +1255,7 @@ pq_getkeepalivesinterval(Port *port)`
`1255`	`1255`
`1256`	`1256`	`if (port->default_keepalives_interval==0)`
`1257`	`1257`	`{`
`1258`		`-socklen_tsize=sizeof(port->default_keepalives_interval);`
	`1258`	`+ACCEPT_TYPE_ARG3size=sizeof(port->default_keepalives_interval);`
`1259`	`1259`
`1260`	`1260`	`if (getsockopt(port->sock,IPPROTO_TCP,TCP_KEEPINTVL,`
`1261`	`1261`	`(char*)&port->default_keepalives_interval,`
`@@ -1327,7 +1327,7 @@ pq_getkeepalivescount(Port *port)`
`1327`	`1327`
`1328`	`1328`	`if (port->default_keepalives_count==0)`
`1329`	`1329`	`{`
`1330`		`-socklen_tsize=sizeof(port->default_keepalives_count);`
	`1330`	`+ACCEPT_TYPE_ARG3size=sizeof(port->default_keepalives_count);`
`1331`	`1331`
`1332`	`1332`	`if (getsockopt(port->sock,IPPROTO_TCP,TCP_KEEPCNT,`
`1333`	`1333`	`(char*)&port->default_keepalives_count,`

`‎src/interfaces/libpq/fe-secure.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.73 2005/10/2415:38:37 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.74 2006/01/2416:38:42 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* [ Most of these notes are wrong/obsolete, but perhaps not all ]`
`@@ -527,7 +527,7 @@ verify_peer(PGconn *conn)`
`527`	`527`	`structhostent*h=NULL;`
`528`	`528`	`structsockaddraddr;`
`529`	`529`	`structsockaddr_in*sin;`
`530`		`-socklen_tlen;`
	`530`	`+ACCEPT_TYPE_ARG3len;`
`531`	`531`	`char**s;`
`532`	`532`	`unsigned longl;`
`533`	`533`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7a9d197

File tree

2 files changed

2 files changed

`‎src/backend/libpq/pqcomm.c‎`

`‎src/interfaces/libpq/fe-secure.c‎`

0 commit comments