infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-25 14:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Coleen Phillimore 2016-04-22 14:48:35 +00:00
commit 77eae51159
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/src/os/posix/vm/os_posix.cpp
View File

@ -181,8 +181,8 @@ int os::log_vsnprintf(char* buf, size_t len, const char* fmt, va_list args) {
return vsnprintf(buf, len, fmt, args);
}
int os::fileno(FILE* fp) {
return ::fileno(fp);
int os::get_fileno(FILE* fp) {
return NOT_AIX(::)fileno(fp);
}
void os::Posix::print_load_average(outputStream* st) {

2
hotspot/src/os/windows/vm/os_windows.cpp
View File

@ -4602,7 +4602,7 @@ int os::ftruncate(int fd, jlong length) {
return 0;
}
int os::fileno(FILE* fp) {
int os::get_fileno(FILE* fp) {
return _fileno(fp);
}

2
hotspot/src/share/vm/logging/logFileOutput.cpp
View File

@ -252,7 +252,7 @@ bool LogFileOutput::initialize(const char* options, outputStream* errstream) {
if (_file_count == 0 && is_regular_file(_file_name)) {
log_trace(logging)("Truncating log file");
os::ftruncate(os::fileno(_stream), 0);
os::ftruncate(os::get_fileno(_stream), 0);
}
return true;

2
hotspot/src/share/vm/runtime/os.hpp
View File

@ -520,7 +520,7 @@ class os: AllStatic {
static int ftruncate(int fd, jlong length);
static int fsync(int fd);
static int available(int fd, jlong *bytes);
static int fileno(FILE* fp);
static int get_fileno(FILE* fp);
static int compare_file_modified_times(const char* file1, const char* file2);