From 13d05c78647ef48069320716c4d52aa06ff9f83d Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sat, 22 Jan 2011 19:20:09 +0000 Subject: Rename currentTimeMillis to currentTimeMicros Reviewed-by: Andrew Haley 2011-01-22 Pekka Enberg * native/jni/java-lang/java_lang_VMSystem.c (currentTimeMillis): Rename currentTimeMillis to currentTimeMicros to reflect what the function returns. --- ChangeLog | 8 +++++++- native/jni/java-lang/java_lang_VMSystem.c | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d0bf6dbd..403cf42f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2011-01-21 Pekka Enberg +2011-01-22 Pekka Enberg + + * native/jni/java-lang/java_lang_VMSystem.c + (currentTimeMillis): Rename currentTimeMillis to + currentTimeMicros to reflect what the function returns. + +2011-01-21 Pekka Enberg * java/lang/Class.java: (getDeclaredField): Throw NullPointerException instead of diff --git a/native/jni/java-lang/java_lang_VMSystem.c b/native/jni/java-lang/java_lang_VMSystem.c index a71247d12..44f789fc0 100644 --- a/native/jni/java-lang/java_lang_VMSystem.c +++ b/native/jni/java-lang/java_lang_VMSystem.c @@ -115,7 +115,7 @@ Java_java_lang_VMSystem_setErr (JNIEnv * env, (*env)->SetStaticObjectField (env, cls, field, obj); } -static jlong currentTimeMillis(JNIEnv * env) +static jlong currentTimeMicros(JNIEnv * env) { /* Note: this implementation copied directly from Japhar's, by Chris Toshok. */ jlong result; @@ -157,7 +157,7 @@ Java_java_lang_VMSystem_nanoTime return result; #else - return currentTimeMillis(env) * (jlong)1000; + return currentTimeMicros(env) * (jlong)1000; #endif } @@ -171,7 +171,7 @@ Java_java_lang_VMSystem_currentTimeMillis (JNIEnv * env, jclass thisClass __attribute__ ((__unused__))) { - return currentTimeMillis(env) / (jlong)1000L; + return currentTimeMicros(env) / (jlong)1000L; } JNIEXPORT jstring JNICALL -- cgit v1.2.1