From 312ee80813429f7c6413270fbc2935b194e343c8 Mon Sep 17 00:00:00 2001
From: kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 19 Jan 2007 01:19:04 +0000
Subject: [PATCH] From Macro Trudel <mtrudel@gmx.ch>: *
gnu/classpath/jdwp/natVMVirtualMachine.cc (jdwpVMInitCB): Use
JNICALL.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120946 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 6 ++++++
libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
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)
{
--
GitLab