diff options
author | Bruno Haible <bruno@clisp.org> | 2009-08-02 16:39:07 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2009-08-03 22:01:26 +0200 |
commit | 2ba450ef74f82b31d23754fe7137dc83e195bf41 (patch) | |
tree | 08e8bfea6af04776baaf706bafa6e728e2ba6446 /lib/sockets.c | |
parent | d7fde077b38e4065ed2d4a48632617fd0d3dfaf0 (diff) | |
download | gnulib-2ba450ef74f82b31d23754fe7137dc83e195bf41.tar.gz |
Allow multiple calls to gl_sockets_startup.
Diffstat (limited to 'lib/sockets.c')
-rw-r--r-- | lib/sockets.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/lib/sockets.c b/lib/sockets.c index 9d5c547928..7cb9981d12 100644 --- a/lib/sockets.c +++ b/lib/sockets.c @@ -69,23 +69,31 @@ close_fd_maybe_socket (int fd, const struct close_hook *remaining_list) static struct close_hook close_sockets_hook; +static int initialized_sockets_version /* = 0 */; + #endif int gl_sockets_startup (int version) { #if WINDOWS_SOCKETS - WSADATA data; - int err; + if (version > initialized_sockets_version) + { + WSADATA data; + int err; - err = WSAStartup (version, &data); - if (err != 0) - return 1; + err = WSAStartup (version, &data); + if (err != 0) + return 1; + + if (data.wVersion < version) + return 2; - if (data.wVersion < version) - return 2; + if (initialized_sockets_version == 0) + register_close_hook (close_fd_maybe_socket, &close_sockets_hook); - register_close_hook (close_fd_maybe_socket, &close_sockets_hook); + initialized_sockets_version = version; + } #endif return 0; @@ -97,6 +105,8 @@ gl_sockets_cleanup (void) #if WINDOWS_SOCKETS int err; + initialized_sockets_version = 0; + unregister_close_hook (&close_sockets_hook); err = WSACleanup (); |