Commit2737974

committed

Cleanup of fe-connect ifdef platform problem added with beos.

1 parent734b1f7 commit2737974Copy full SHA for 2737974

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.135 2000/10/03 03:11:25 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.136 2000/10/03 03:39:46 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -620,14 +620,13 @@ static int`
`620`	`620`	`connectMakeNonblocking(PGconn*conn)`
`621`	`621`	`{`
`622`	`622`	`#ifdefWIN32`
`623`		`-if (fcntl(conn->sock,F_SETFL,O_NONBLOCK)<0)`
	`623`	`+inton=1;`
	`624`	`+if (ioctlsocket(conn->sock,FIONBIO,&on)!=0)`
`624`	`625`	`#elif defined(__BEOS__)`
`625`	`626`	`inton=1;`
`626`	`627`	`if (ioctl(conn->sock,FIONBIO,&on)!=0)`
`627`	`628`	`#else`
`628`		`-inton=1;`
`629`		`-`
`630`		`-if (ioctlsocket(conn->sock,FIONBIO,&on)!=0)`
	`629`	`+if (fcntl(conn->sock,F_SETFL,O_NONBLOCK)<0)`
`631`	`630`	`#endif`
`632`	`631`	`{`
`633`	`632`	`printfPQExpBuffer(&conn->errorMessage,`

Comments

(0)