Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JDK-8266797: Fix for 8266610 breaks the build on macos #3943

Closed
wants to merge 3 commits into from
Closed

JDK-8266797: Fix for 8266610 breaks the build on macos #3943

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b389921
JDK-8266797: Fix for 8266610 breaks the build on macos
vyommani May 10, 2021
4df3405
added the additional check so that modified code get executed on linu…
vyommani May 10, 2021
21b09ef
fixed the indentation
vyommani May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/java.base/unix/native/libjava/io_util_md.c
View file
Open in desktop
Expand Up @@ -32,6 +32,9 @@

#if defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(_AIX)
#include <sys/ioctl.h>
#endif

#if defined(__linux__)
#include <linux/fs.h>
#include <sys/stat.h>
vyommani marked this conversation as resolved.
Show resolved Hide resolved
#endif
Expand Down Expand Up @@ -250,7 +253,7 @@ handleGetLength(FD fd)
if (result < 0) {
return -1;
}
#ifdef BLKGETSIZE64
#if defined(__linux__) && defined(BLKGETSIZE64)
vyommani marked this conversation as resolved.
Show resolved Hide resolved
if (S_ISBLK(sb.st_mode)) {
uint64_t size;
if(ioctl(fd, BLKGETSIZE64, &size) < 0) {
Expand Down