From 63c54435e6eaaeba0fe76573e4e8f210fef5c7c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Fri, 8 May 2015 22:31:19 -0400 Subject: [PATCH] src/ffi: avoid duplicating visibility attributes of JNI native functions in C MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- src/ffi/java.nit | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/ffi/java.nit b/src/ffi/java.nit index 830e68c..ae37d9d 100644 --- a/src/ffi/java.nit +++ b/src/ffi/java.nit @@ -424,7 +424,7 @@ redef class MExplicitCall var csignature = mproperty.build_c_implementation_signature(recv_mtype, mmodule, "___indirect", long_signature, from_java_call_context) var cf = new CFunction("JNIEXPORT {csignature}") cf.exprs.add "\t{mproperty.build_ccall(recv_mtype, mainmodule, null, long_signature, from_java_call_context, null)}\n" - ccu.add_local_function cf + ccu.add_non_static_local_function cf # In Java, declare the extern method as a private static local method var java_signature = mproperty.build_csignature(recv_mtype, mainmodule, null, short_signature, java_call_context) @@ -651,3 +651,17 @@ end private fun java_call_context: JavaCallContext do return new JavaCallContext private fun to_java_call_context: ToJavaCallContext do return new ToJavaCallContext private fun from_java_call_context: FromJavaCallContext do return new FromJavaCallContext + +redef class CCompilationUnit + # Similar to `add_local_function` but not `static` + # + # Used when the signature contains a visibility attribute. + private fun add_non_static_local_function(c_function: CFunction) + do + body_decl.add c_function.signature + body_decl.add ";\n" + + body_impl.add "\n" + body_impl.add c_function.to_writer + end +end -- 1.7.9.5