Mercurial > hg > release > icedtea6-1.6

view patches/systemtap-gcc-4.5.patch @ 1729:54c929c868e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR476: Enable building SystemTap on GCC 4.5. 2010-04-28 Andrew John Hughes <ahughes@redhat.com> PR icedtea/476 * Makefile.am: Add patch when SystemTap is enabled to support building with GCC 4.5. * patches/systemtap-gcc-4.5.patch: Add cast to NULL (doesn't apply to DTrace due to differences between SystemTap and DTrace macros).
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 28 Apr 2010 23:04:32 +0100
parents
children
line wrap: on
line source

--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 08:51:29.000000000 +0100
+++ openjdk/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 09:29:22.000000000 +0100
@@ -2723,7 +2723,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;
     }
   }