diff options
| -rw-r--r-- | src/os/linux/vm/os_linux.inline.hpp | 5 | ||||
| -rw-r--r-- | src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/os/linux/vm/os_linux.inline.hpp b/src/os/linux/vm/os_linux.inline.hpp index 10d56d89f..fea10fa64 100644 --- a/src/os/linux/vm/os_linux.inline.hpp +++ b/src/os/linux/vm/os_linux.inline.hpp @@ -114,8 +114,12 @@ inline int os::ftruncate(int fd, jlong length) { return ::ftruncate64(fd, length); } +// readdir_r has been deprecated since glibc 2.24. +// See https://sourceware.org/bugzilla/show_bug.cgi?id=19056 for more details. +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) { + dirent* p; int status; assert(dirp != NULL, "just checking"); @@ -129,6 +133,7 @@ inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) return NULL; } else return p; + } inline int os::closedir(DIR *dirp) { diff --git a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp index 1a7375afc..e963daa29 100644 --- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, err.report_and_die(); ShouldNotReachHere(); + return false; } void os::Linux::init_thread_fpu_state(void) { |