diff src/os/windows/vm/os_windows.cpp @ 10202:0b55a78c6be5

Merge
author bharadwaj
date Fri, 26 Apr 2013 10:52:26 -0700
parents cc12becb22e7 e12c9b3740db
children f9be75d21404
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.cpp	Fri Apr 26 00:40:22 2013 -0700
+++ b/src/os/windows/vm/os_windows.cpp	Fri Apr 26 10:52:26 2013 -0700
@@ -1221,8 +1221,10 @@
 
 // Needs to be in os specific directory because windows requires another
 // header file <direct.h>
-const char* os::get_current_directory(char *buf, int buflen) {
-  return _getcwd(buf, buflen);
+const char* os::get_current_directory(char *buf, size_t buflen) {
+  int n = static_cast<int>(buflen);
+  if (buflen > INT_MAX)  n = INT_MAX;
+  return _getcwd(buf, n);
 }
 
 //-----------------------------------------------------------
@@ -4098,6 +4100,10 @@
   return ::open(pathbuf, oflag | O_BINARY | O_NOINHERIT, mode);
 }
 
+FILE* os::open(int fd, const char* mode) {
+  return ::_fdopen(fd, mode);
+}
+
 // Is a (classpath) directory empty?
 bool os::dir_is_empty(const char* path) {
   WIN32_FIND_DATA fd;