changeset 22589:ca8e46278bae

Create default for os::default_file_open_flags on Solaris; JVMCIRuntime::parse_lines: use ::open instead of os::open
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Mon, 21 Sep 2015 11:48:40 +0200
parents 3e3d5678a6bf
children 3f6488b29c1a
files src/os/solaris/vm/os_solaris.inline.hpp src/share/vm/jvmci/jvmciRuntime.cpp
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.inline.hpp	Fri Sep 18 14:31:54 2015 -0700
+++ b/src/os/solaris/vm/os_solaris.inline.hpp	Mon Sep 21 11:48:40 2015 +0200
@@ -71,6 +71,8 @@
 }
 inline void os::dll_unload(void *lib) { ::dlclose(lib); }
 
+inline const int os::default_file_open_flags() { return 0;}
+
 inline DIR* os::opendir(const char* dirname) {
   assert(dirname != NULL, "just checking");
   return ::opendir(dirname);
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Fri Sep 18 14:31:54 2015 -0700
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Mon Sep 21 11:48:40 2015 +0200
@@ -1015,7 +1015,7 @@
 void JVMCIRuntime::parse_lines(char* path, ParseClosure* closure, bool warnStatFailure) {
   struct stat st;
   if (::stat(path, &st) == 0 && (st.st_mode & S_IFREG) == S_IFREG) { // exists & is regular file
-    int file_handle = os::open(path, os::default_file_open_flags(), 0);
+    int file_handle = ::open(path, os::default_file_open_flags(), 0);
     if (file_handle != -1) {
       char* buffer = NEW_C_HEAP_ARRAY(char, st.st_size + 1, mtInternal);
       int num_read;