Commit7411ec2

committed

Undo changes for testlibpq2.c and isolationtester.c

1 parent38edca7 commit7411ec2Copy full SHA for 7411ec2

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,11 @@`
`34`	`34`	`#include<errno.h>`
`35`	`35`	`#include<sys/time.h>`
`36`	`36`	`#include<sys/types.h>`
	`37`	`+#ifdefHAVE_SYS_SELECT_H`
	`38`	`+#include<sys/select.h>`
	`39`	`+#endif`
`37`	`40`
`38`	`41`	`#include"libpq-fe.h"`
`39`		`-#include"pg_socket.h"`
`40`	`42`
`41`	`43`	`staticvoid`
`42`	`44`	`exit_nicely(PGconn*conn)`
`@@ -112,8 +114,7 @@ main(int argc, char **argv)`
`112`	`114`	`FD_ZERO(&input_mask);`
`113`	`115`	`FD_SET(sock,&input_mask);`
`114`	`116`
`115`		`-if (pg_select(sock+1,&input_mask,NULL,NULL,NULL,`
`116`		`-PQisRsocket(conn))<0)`
	`117`	`+if (select(sock+1,&input_mask,NULL,NULL,NULL)<0)`
`117`	`118`	`{`
`118`	`119`	`fprintf(stderr,"select() failed: %s\n",strerror(errno));`
`119`	`120`	`exit_nicely(conn);`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,14 @@`
`11`	`11`	`#include<windows.h>`
`12`	`12`	`#endif`
`13`	`13`	`#include<sys/time.h>`
	`14`	`+#ifdefHAVE_SYS_SELECT_H`
	`15`	`+#include<sys/select.h>`
	`16`	`+#endif`
`14`	`17`
`15`	`18`	`#include"datatype/timestamp.h"`
`16`	`19`	`#include"libpq-fe.h"`
`17`	`20`	`#include"pqexpbuffer.h"`
`18`	`21`	`#include"pg_getopt.h"`
`19`		`-#include"pg_socket.h"`
`20`	`22`
`21`	`23`	`#include"isolationtester.h"`
`22`	`24`
`@@ -718,8 +720,7 @@ try_complete_step(Step *step, int flags)`
`718`	`720`	`timeout.tv_sec=0;`
`719`	`721`	`timeout.tv_usec=10000;/* Check for lock waits every 10ms. */`
`720`	`722`
`721`		`-ret=pg_select(sock+1,&read_set,NULL,NULL,&timeout,`
`722`		`-PQisRsocket(conn));`
	`723`	`+ret=select(sock+1,&read_set,NULL,NULL,&timeout);`
`723`	`724`	`if (ret<0)/* error in select() */`
`724`	`725`	`{`
`725`	`726`	`if (errno==EINTR)`

Comments

(0)