Mercurial > hg > graal-compiler
diff src/share/vm/jvmci/jvmciRuntime.cpp @ 21587:59c3f921e454
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
| author | Christian Wirth <christian.wirth@oracle.com> |
|---|---|
| date | Fri, 29 May 2015 12:59:12 +0200 |
| parents | 2270a708ef23 |
| children | 7a7cf422160b |
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciRuntime.cpp Fri May 29 11:35:20 2015 +0200 +++ b/src/share/vm/jvmci/jvmciRuntime.cpp Fri May 29 12:59:12 2015 +0200 @@ -39,7 +39,11 @@ #include "utilities/debug.hpp" #include "utilities/defaultStream.hpp" - jobject JVMCIRuntime::_HotSpotJVMCIRuntime_instance = NULL; +#if defined(_MSC_VER) +#define strtoll _strtoi64 +#endif + +jobject JVMCIRuntime::_HotSpotJVMCIRuntime_instance = NULL; bool JVMCIRuntime::_HotSpotJVMCIRuntime_initialized = false; bool JVMCIRuntime::_shutdown_called = false; @@ -854,7 +858,7 @@ break; } case _float: { - optionValue.float_value = ::strtof(value, &check); + optionValue.float_value = (float)::strtod(value, &check); //strtof not available in Windows SDK yet if (*check != '\0' || errno == ERANGE) { jio_fprintf(defaultStream::error_stream(), "Expected float value for VM option '%s'\n", name); return false;