diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-03-28 10:36:01 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-03-28 10:36:01 +0300 |
| commit | 7dc565a2cffeda8e7f5cf2806c056298e7907aba (patch) | |
| tree | d7cb36e0cc9e15eaf13db02be68bf1c6de5b0559 | |
| parent | 01d1024bec7781066440104ebee0b186382e10f3 (diff) | |
| download | emacs-7dc565a2cffeda8e7f5cf2806c056298e7907aba.tar.gz | |
Fix blocking connections on MS-Windows (Bug#20159)
src/w32.c (sys_connect): Fix a mistake in previous commit that broke
blocking connections.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32.c | 2 |
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 @@ +2015-03-28 Eli Zaretskii <eliz@gnu.org> + + * w32.c (sys_connect): Fix a mistake in previous commit that broke + blocking connections. (Bug#20159) + 2015-03-27 Paul Eggert <eggert@cs.ucla.edu> 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) errno = EINPROGRESS; /* that's what process.c expects */ fd_info[s].flags |= FILE_CONNECT; } - return rc; } + return rc; } errno = ENOTSOCK; return SOCKET_ERROR; |