Mercurial > hg > openjdk > bsd-port > hotspot
changeset 5956:3760cef47599
8167198: Changes to make AIX compile after the merge
Reviewed-by: andrew
| author | goetz |
|---|---|
| date | Wed, 21 Jan 2015 15:02:03 +0100 |
| parents | b11238ed5526 |
| children | f63bd8d2d523 |
| files | src/os/aix/vm/os_aix.cpp src/share/vm/utilities/vmError.cpp |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/aix/vm/os_aix.cpp Mon Jul 28 10:19:55 2014 +0200 +++ b/src/os/aix/vm/os_aix.cpp Wed Jan 21 15:02:03 2015 +0100 @@ -1226,10 +1226,6 @@ ::abort(); } -// Unused on Aix for now. -void os::set_error_file(const char *logfile) {} - - // This method is a copy of JDK's sysGetLastErrorString // from src/solaris/hpi/src/system_md.c
--- a/src/share/vm/utilities/vmError.cpp Mon Jul 28 10:19:55 2014 +0200 +++ b/src/share/vm/utilities/vmError.cpp Wed Jan 21 15:02:03 2015 +0100 @@ -22,7 +22,6 @@ * */ -#include <fcntl.h> #include "precompiled.hpp" #include "compiler/compileBroker.hpp" #include "gc_interface/collectedHeap.hpp" @@ -43,6 +42,8 @@ #include "utilities/top.hpp" #include "utilities/vmError.hpp" +#include <fcntl.h> + // List of environment variables that should be reported in error log file. const char *env_list[] = { // All platforms