Mercurial > hg > release > icedtea7-forest-2.0 > hotspot

changeset 2658:7693eb0fce1f icedtea-2.0-branchpoint

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix DTrace-enabled builds on gcc 4.5
author andrew
date Thu, 22 Sep 2011 02:01:00 +0100
parents 621c7058e9cc
children b28ae681bae0
files src/share/vm/prims/jni.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp	Thu Sep 22 01:55:17 2011 +0100
+++ b/src/share/vm/prims/jni.cpp	Thu Sep 22 02:01:00 2011 +0100
@@ -2804,7 +2804,7 @@
 
   if (!directBufferSupportInitializeEnded) {
     if (!initializeDirectBufferSupport(env, thread)) {
-      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
+      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL);
       return NULL;
     }
   }