Merge pull request #328 from dicej/windows

Windows
This commit is contained in:
Joshua Warner 2014-08-19 12:53:59 -06:00
commit 0c464f3f84
2 changed files with 3 additions and 3 deletions

View File

@ -5917,9 +5917,9 @@ extern "C" AVIAN_EXPORT int64_t JNICALL
// implementing findJavaTZ_md ourselves from scratch, but that would
// be a lot of code to implement and maintain.
object country = arguments[1];
GcString* country = cast<GcString>(t, reinterpret_cast<object>(arguments[1]));
THREAD_RUNTIME_ARRAY(t, char, countryChars, stringLength(t, country) + 1);
THREAD_RUNTIME_ARRAY(t, char, countryChars, country->length(t) + 1);
stringChars(t, country, RUNTIME_ARRAY_BODY(countryChars));
local::MyClasspath* cp = static_cast<local::MyClasspath*>(t->m->classpath);

View File

@ -38,7 +38,7 @@ has_flag() {
make_target=test
run_cmake -DCMAKE_BUILD_TYPE=Debug
test `uname -o` = "Cygwin" || run_cmake -DCMAKE_BUILD_TYPE=Debug
run make jdk-test
run make ${flags} ${make_target}