--- a/hotspot/src/os/posix/vm/os_posix.cpp	Fri Apr 22 13:16:57 2016 +0000
+++ b/hotspot/src/os/posix/vm/os_posix.cpp	Fri Apr 22 14:48:35 2016 +0000
@@ -181,8 +181,8 @@
     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) {

--- a/hotspot/src/os/windows/vm/os_windows.cpp	Fri Apr 22 13:16:57 2016 +0000
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Fri Apr 22 14:48:35 2016 +0000
@@ -4602,7 +4602,7 @@
   return 0;
 }
 
-int os::fileno(FILE* fp) {
+int os::get_fileno(FILE* fp) {
   return _fileno(fp);
 }
 

--- a/hotspot/src/share/vm/logging/logFileOutput.cpp	Fri Apr 22 13:16:57 2016 +0000
+++ b/hotspot/src/share/vm/logging/logFileOutput.cpp	Fri Apr 22 14:48:35 2016 +0000
@@ -252,7 +252,7 @@
 
   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;

--- a/hotspot/src/share/vm/runtime/os.hpp	Fri Apr 22 13:16:57 2016 +0000
+++ b/hotspot/src/share/vm/runtime/os.hpp	Fri Apr 22 14:48:35 2016 +0000
@@ -520,7 +520,7 @@
   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);