From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 3 Oct 2000 03:39:46 +0000 (+0000)
Subject: Cleanup of fe-connect ifdef platform problem added with beos.
X-Git-Tag: REL7_1_BETA~583
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2737974085c897b4f75250c665e52ca84208e02c;p=thirdparty%2Fpostgresql.git

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

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 663ec7cb668..a02d0ee3ed4 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.135 2000/10/03 03:11:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.136 2000/10/03 03:39:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -620,14 +620,13 @@ static int
 connectMakeNonblocking(PGconn *conn)
 {
 #ifdef WIN32
-	if (fcntl(conn->sock, F_SETFL, O_NONBLOCK) < 0)
+	int			on = 1;
+	if (ioctlsocket(conn->sock, FIONBIO, &on) != 0)
 #elif defined(__BEOS__)
 	int			on = 1;
     if (ioctl(conn->sock, FIONBIO, &on) != 0)
 #else
-	int			on = 1;
-
-	if (ioctlsocket(conn->sock, FIONBIO, &on) != 0)
+	if (fcntl(conn->sock, F_SETFL, O_NONBLOCK) < 0)
 #endif
 	{
 		printfPQExpBuffer(&conn->errorMessage,