summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Seitz <keiths@redhat.com>2007-01-19 01:19:04 +0000
committerKeith Seitz <kseitz@gcc.gnu.org>2007-01-19 01:19:04 +0000
commit640f891823d260e6e10bd5aa36d568ae8bbca24b (patch)
tree02d16167170fd25556c1a7ebb1a73bf9595bb93a
parentf85242f0ce997c299c1a07f5fe94f5ffe63bf599 (diff)
downloadgcc-640f891823d260e6e10bd5aa36d568ae8bbca24b.tar.gz
From Macro Trudel <mtrudel@gmx.ch>:
* gnu/classpath/jdwp/natVMVirtualMachine.cc (jdwpVMInitCB): Use JNICALL. From-SVN: r120946
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc4
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e572a5f91a9..2e763c95923 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 351bb23ccb2..5243291a537 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)
{