Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoramurillo
Thu, 05 Feb 2015 14:57:52 -0800
changeset 28840 759e09099cd7
parent 28744 4283637ac96e (diff)
parent 28839 627c26f2e54b (current diff)
child 28841 5b50f9ab11b8
child 28934 903e319e521a
child 28935 a0a29e3b7864
child 28948 0efe6d90f20c
Merge
hotspot/test/serviceability/dcmd/ClassLoaderStatsTest.java file | annotate | diff | comparison | revisions
hotspot/test/serviceability/dcmd/DcmdUtil.java file | annotate | diff | comparison | revisions
hotspot/test/serviceability/dcmd/DynLibDcmdTest.java file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/prims/jvm.cpp	Thu Feb 05 12:23:29 2015 +0100
+++ b/hotspot/src/share/vm/prims/jvm.cpp	Thu Feb 05 14:57:52 2015 -0800
@@ -304,7 +304,7 @@
 // java.lang.System, but we choose to keep it here so that it stays next
 // to JVM_CurrentTimeMillis and JVM_NanoTime
 
-const jlong MAX_DIFF_SECS = 0x0100000000;   //  2^32
+const jlong MAX_DIFF_SECS = 0x0100000000LL; //  2^32
 const jlong MIN_DIFF_SECS = -MAX_DIFF_SECS; // -2^32
 
 JVM_LEAF(jlong, JVM_GetNanoTimeAdjustment(JNIEnv *env, jclass ignored, jlong offset_secs))
jdk-sandbox