diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-18 07:45:53 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-18 07:45:53 -0400 |
| commit | 69b139cfca6c5eef64558070f533b6c898f410e0 (patch) | |
| tree | 12d281e91cc1f71c56e2e1372589085df4df8265 /Utilities/cmlibuv/src/win/winsock.c | |
| parent | ab63072381171e9c5a7164536f0912b8b3a4a313 (diff) | |
| parent | b4069b04ff63b327ff4881282200c3c73fded34d (diff) | |
| download | cmake-69b139cfca6c5eef64558070f533b6c898f410e0.tar.gz | |
Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
libuv 2019-06-10 (ee24ce90)
Diffstat (limited to 'Utilities/cmlibuv/src/win/winsock.c')
| -rw-r--r-- | Utilities/cmlibuv/src/win/winsock.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Utilities/cmlibuv/src/win/winsock.c b/Utilities/cmlibuv/src/win/winsock.c index 5e7da2a8f2..5820ba9c66 100644 --- a/Utilities/cmlibuv/src/win/winsock.c +++ b/Utilities/cmlibuv/src/win/winsock.c @@ -87,12 +87,6 @@ void uv_winsock_init(void) { WSAPROTOCOL_INFOW protocol_info; int opt_len; - /* Initialize winsock */ - errorno = WSAStartup(MAKEWORD(2, 2), &wsa_data); - if (errorno != 0) { - uv_fatal_error(errorno, "WSAStartup"); - } - /* Set implicit binding address used by connectEx */ if (uv_ip4_addr("0.0.0.0", 0, &uv_addr_ip4_any_)) { abort(); @@ -102,6 +96,15 @@ void uv_winsock_init(void) { abort(); } + /* Skip initialization in safe mode without network support */ + if (1 == GetSystemMetrics(SM_CLEANBOOT)) return; + + /* Initialize winsock */ + errorno = WSAStartup(MAKEWORD(2, 2), &wsa_data); + if (errorno != 0) { + uv_fatal_error(errorno, "WSAStartup"); + } + /* Detect non-IFS LSPs */ dummy = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); |