From: Keith Seitz <keiths@redhat.com>
Date: Fri, 19 Jan 2007 01:19:04 +0000 (+0000)
Subject: From Macro Trudel <mtrudel@gmx.ch>:
X-Git-Tag: releases/gcc-4.3.0~7391
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=640f891823d260e6e10bd5aa36d568ae8bbca24b;p=thirdparty%2Fgcc.git

From Macro Trudel <mtrudel@gmx.ch>:

        * gnu/classpath/jdwp/natVMVirtualMachine.cc (jdwpVMInitCB):
        Use JNICALL.

From-SVN: r120946
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e572a5f91a99..2e763c959234 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-18  Keith Seitz  <keiths@redhat.com>
+
+	From Macro Trudel <mtrudel@gmx.ch>:
+	* gnu/classpath/jdwp/natVMVirtualMachine.cc (jdwpVMInitCB):
+	Use JNICALL.
+
 2007-01-18  Marco Trudel  <mtrudel@gmx.ch>
 
 	* jni.cc (_Jv_JNI_FindClass): Initialize class.
diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
index 351bb23ccb2a..5243291a537f 100644
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
@@ -38,7 +38,7 @@ using namespace gnu::classpath::jdwp::event;
 using namespace gnu::classpath::jdwp::util;
 
 // Forward declarations
-static void jdwpVMInitCB (jvmtiEnv *env, JNIEnv *jni_env, jthread thread);
+static void JNICALL jdwpVMInitCB (jvmtiEnv *, JNIEnv *, jthread);
 
 #define DEFINE_CALLBACK(Cb,Event) Cb.Event = jdwp ## Event ## CB
 #define ENABLE_EVENT(Event,Thread)					\
@@ -359,7 +359,7 @@ gnu::classpath::jdwp::VMVirtualMachine::getSourceFile (jclass clazz)
   return NULL;
 }
 
-static void
+static void JNICALL
 jdwpVMInitCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
 	      jthread thread)
 {