diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-25 11:16:27 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-25 11:16:49 -0700 |
commit | f28235237df7ab45ff4a17e21891faa8f4ea8dcf (patch) | |
tree | 7e7fb6114bdeb681d8b64f001e65cee622cc5090 /lib/sockets.c | |
parent | 11792d29f9721da2568ab78436edb2032aa1146e (diff) | |
download | gnulib-f28235237df7ab45ff4a17e21891faa8f4ea8dcf.tar.gz |
sockets: MS Windows initalization fixes
Problem reported by Test User in:
http://lists.gnu.org/archive/html/help-shishi/2015-09/msg00001.html
* lib/sockets.h (SOCKETS_1_0, SOCKETS_2_0, SOCKETS_2_1):
Correct the endianness.
* lib/sockets.c (gl_sockets_startup): Return 2 on any version
number mismatch, not just on <. Cleanup before any such failure.
Diffstat (limited to 'lib/sockets.c')
-rw-r--r-- | lib/sockets.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sockets.c b/lib/sockets.c index 0b60562c4c..e644ff12c9 100644 --- a/lib/sockets.c +++ b/lib/sockets.c @@ -121,8 +121,11 @@ gl_sockets_startup (int version _GL_UNUSED) if (err != 0) return 1; - if (data.wVersion < version) - return 2; + if (data.wVersion != version) + { + WSACleanup (); + return 2; + } if (initialized_sockets_version == 0) register_fd_hook (close_fd_maybe_socket, ioctl_fd_maybe_socket, |