summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane2001-03-31 23:14:37 +0000
committerTom Lane2001-03-31 23:14:37 +0000
commit98f751569624684192ca966398ba0b1fb0267656 (patch)
tree6ed81c4a12d6f23b5fdbd51acbe6cbc1c9c0e99f /src
parentfc0d3f14478acf3d7b7d93feaf6ba788951928f1 (diff)
On Cygwin, do initial connect() call in blocking mode, per report from
Jason Tishler.
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/libpq/fe-connect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index dfa81c08221..18770f49f51 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.163 2001/03/23 04:49:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.164 2001/03/31 23:14:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -916,7 +916,7 @@ connectDBStart(PGconn *conn)
*
* Ewan Mellor <eem21@cam.ac.uk>.
*/
-#if (!defined(WIN32) || defined(WIN32_NON_BLOCKING_CONNECTIONS)) && !defined(USE_SSL)
+#if ((!defined(WIN32) && !defined(__CYGWIN__)) || defined(WIN32_NON_BLOCKING_CONNECTIONS)) && !defined(USE_SSL)
if (connectMakeNonblocking(conn) == 0)
goto connect_errReturn;
#endif
@@ -1036,7 +1036,7 @@ connectDBStart(PGconn *conn)
* This makes the connection non-blocking, for all those cases which
* forced us not to do it above.
*/
-#if (defined(WIN32) && !defined(WIN32_NON_BLOCKING_CONNECTIONS)) || defined(USE_SSL)
+#if ((defined(WIN32) || defined(__CYGWIN__)) && !defined(WIN32_NON_BLOCKING_CONNECTIONS)) || defined(USE_SSL)
if (connectMakeNonblocking(conn) == 0)
goto connect_errReturn;
#endif