archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2021-01-12 01:08:14 +00:00
commit b378f54df3
12 changed files with 137 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/java.base/windows/native/libnio/ch/UnixDomainSockets.c
View file

@ -92,7 +92,16 @@ Java_sun_nio_ch_UnixDomainSockets_socketSupported(JNIEnv *env, jclass cl)
return JNI_FALSE;
}
closesocket(s);
return JNI_TRUE;
/* Check for build 18362 or newer, due to Windows bug described in 8259014 */
OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 };
DWORDLONG cond_mask = 0;
VER_SET_CONDITION(cond_mask, VER_BUILDNUMBER, VER_GREATER_EQUAL);
osvi.dwBuildNumber = 18362; // Windows 10 (1903) or newer
return VerifyVersionInfoW(&osvi, VER_BUILDNUMBER, cond_mask) != 0;
}
JNIEXPORT jint JNICALL