# HG changeset patch # User andrew # Date 1316653260 -3600 # Node ID 7693eb0fce1f6b484cce96c233ea20bdad8a09e0 # Parent 621c7058e9cc8d4b3ad3c756e17e1b2e67990cab Fix DTrace-enabled builds on gcc 4.5 diff -r 621c7058e9cc -r 7693eb0fce1f src/share/vm/prims/jni.cpp --- 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; } }