From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 22 Sep 2006 21:31:15 +0000 (+0000)
Subject: 2006-09-22  Marco Trudel  <mtrudel@gmx.ch>
X-Git-Tag: upstream/4.9.2~52934
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dda4bff3007dedd8af8b4062fc7a29984b5a2712;p=platform%2Fupstream%2Flinaro-gcc.git

2006-09-22  Marco Trudel  <mtrudel@gmx.ch>

	* jvmti.cc (_Jv_JVMTI_GetErrorName): Now static.  Marked JNICALL.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117153 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a396f80..843e466 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 5adc2cd..8f8304d 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)
 {