]> granicus.if.org Git - postgresql/commitdiff
Cleanup of fe-connect ifdef platform problem added with beos.
authorBruce Momjian <bruce@momjian.us>
Tue, 3 Oct 2000 03:39:46 +0000 (03:39 +0000)
committerBruce Momjian <bruce@momjian.us>
Tue, 3 Oct 2000 03:39:46 +0000 (03:39 +0000)
src/interfaces/libpq/fe-connect.c

index 663ec7cb6680ba18ba0392c63d49a2266cb52a1f..a02d0ee3ed40cbd665d7e663bdccfabe3eb7d54c 100644 (file)
@@ -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,