aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index db3056ce6bd..0cc0a42b349 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12015-03-28 Eli Zaretskii <eliz@gnu.org>
2
3 * w32.c (sys_connect): Fix a mistake in previous commit that broke
4 blocking connections. (Bug#20159)
5
12015-03-27 Paul Eggert <eggert@cs.ucla.edu> 62015-03-27 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Avoid some core dumps in X session management 8 Avoid some core dumps in X session management
diff --git a/src/w32.c b/src/w32.c
index 1917fea343d..6f16704909c 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -7489,8 +7489,8 @@ sys_connect (int s, const struct sockaddr * name, int namelen)
7489 errno = EINPROGRESS; /* that's what process.c expects */ 7489 errno = EINPROGRESS; /* that's what process.c expects */
7490 fd_info[s].flags |= FILE_CONNECT; 7490 fd_info[s].flags |= FILE_CONNECT;
7491 } 7491 }
7492 return rc;
7493 } 7492 }
7493 return rc;
7494 } 7494 }
7495 errno = ENOTSOCK; 7495 errno = ENOTSOCK;
7496 return SOCKET_ERROR; 7496 return SOCKET_ERROR;