From 7baef5d61961906bcdf0b53dc9122909cb4f5347 Mon Sep 17 00:00:00 2001
From: Steve Poole <spoole@uk.ibm.com>
Date: Wed, 15 Dec 2010 09:15:20 +0000
Subject: [PATCH] 6927816: Demo crash in heaptracker with Non-Sun JDK due to
 possible violation of JNI spec

Reviewed-by: ohair, alanb
---
 jdk/src/share/demo/jvmti/heapTracker/heapTracker.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/share/demo/jvmti/heapTracker/heapTracker.c b/jdk/src/share/demo/jvmti/heapTracker/heapTracker.c
index 8cc294c6600..4704c5bf1e2 100644
--- a/jdk/src/share/demo/jvmti/heapTracker/heapTracker.c
+++ b/jdk/src/share/demo/jvmti/heapTracker/heapTracker.c
@@ -340,7 +340,7 @@ tagObjectWithTraceInfo(jvmtiEnv *jvmti, jobject object, TraceInfo *tinfo)
 }
 
 /* Java Native Method for Object.<init> */
-static void
+static void JNICALL
 HEAP_TRACKER_native_newobj(JNIEnv *env, jclass klass, jthread thread, jobject o)
 {
     TraceInfo *tinfo;
@@ -353,7 +353,7 @@ HEAP_TRACKER_native_newobj(JNIEnv *env, jclass klass, jthread thread, jobject o)
 }
 
 /* Java Native Method for newarray */
-static void
+static void JNICALL
 HEAP_TRACKER_native_newarr(JNIEnv *env, jclass klass, jthread thread, jobject a)
 {
     TraceInfo *tinfo;