Merged gcj-eclipse branch to trunk.

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

1 files changed, 25 insertions, 25 deletions

diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 4b3725855f6..dc63cc868e7 100644
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -1179,13 +1179,13 @@ _Jv_count_arguments (_Jv_Utf8Const *signature,
  * caller.
  */
 
-static int 
-init_cif (_Jv_Utf8Const* signature,
-	  int arg_count,
-	  jboolean staticp,
-	  ffi_cif *cif,
-	  ffi_type **arg_types,
-	  ffi_type **rtype_p)
+int 
+_Jv_init_cif (_Jv_Utf8Const* signature,
+	      int arg_count,
+	      jboolean staticp,
+	      ffi_cif *cif,
+	      ffi_type **arg_types,
+	      ffi_type **rtype_p)
 {
   unsigned char *ptr = (unsigned char*) signature->chars();
 
@@ -1269,12 +1269,12 @@ _Jv_InterpMethod::ncode ()
     (ncode_closure*)_Jv_AllocBytes (sizeof (ncode_closure)
 					+ arg_count * sizeof (ffi_type*));
 
-  init_cif (self->signature,
-	    arg_count,
-	    staticp,
-	    &closure->cif,
-	    &closure->arg_types[0],
-	    NULL);
+  _Jv_init_cif (self->signature,
+		arg_count,
+		staticp,
+		&closure->cif,
+		&closure->arg_types[0],
+		NULL);
 
   ffi_closure_fun fun;
 
@@ -1465,12 +1465,12 @@ _Jv_JNIMethod::ncode ()
 				    + arg_count * sizeof (ffi_type*));
 
   ffi_type *rtype;
-  init_cif (self->signature,
-	    arg_count,
-	    staticp,
-	    &closure->cif,
-	    &closure->arg_types[0],
-	    &rtype);
+  _Jv_init_cif (self->signature,
+		arg_count,
+		staticp,
+		&closure->cif,
+		&closure->arg_types[0],
+		&rtype);
 
   ffi_closure_fun fun;
 
@@ -1632,12 +1632,12 @@ _Jv_InterpreterEngine::do_resolve_method (_Jv_Method *method, jclass klass,
 		    + arg_count*sizeof (ffi_type*));
 
   result->stack_item_count
-    = init_cif (method->signature,
-		arg_count,
-		staticp,
-		&result->cif,
-		&result->arg_types[0],
-		NULL);
+    = _Jv_init_cif (method->signature,
+		    arg_count,
+		    staticp,
+		    &result->cif,
+		    &result->arg_types[0],
+		    NULL);
 
   result->method              = method;
   result->klass               = klass;