diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a396f809492..843e466106b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-22  Marco Trudel  <mtrudel@gmx.ch>
+
+	* jvmti.cc (_Jv_JVMTI_GetErrorName): Now static.  Marked JNICALL.
+
 2006-09-21  Keith Seitz  <keiths@redhat.com>
 
 	* jvmti.cc (_Jv_JVMTI_DisposeEnvironment): Check for enabled
diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc
index 5adc2cde159..8f8304dba63 100644
--- a/libjava/jvmti.cc
+++ b/libjava/jvmti.cc
@@ -966,7 +966,7 @@ _Jv_JVMTI_SetEventCallbacks (jvmtiEnv *env,
   return JVMTI_ERROR_NONE;
 }
 
-jvmtiError
+static jvmtiError JNICALL
 _Jv_JVMTI_GetErrorName (MAYBE_UNUSED jvmtiEnv *env, jvmtiError error,
 			char **name_ptr)
 {