Merge branch 'master' into mc

[simgrid.git] / src / bindings / java / jmsg_comm.h

diff --git a/src/bindings/java/jmsg_comm.h b/src/bindings/java/jmsg_comm.h
index ce86f9d..7849c6c 100644 (file)
--- a/src/bindings/java/jmsg_comm.h
+++ b/src/bindings/java/jmsg_comm.h
@@ -1,11 +1,15 @@
-/* Functions related to the java comm instances                                                                                                                                */
+/* Functions related to the java comm instances                             */
 
-/* Copyright (c) 2012. The SimGrid Team. All rights reserved.                   */
+/* Copyright (c) 2012-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef MSG_JCOMM_H
 #define MSG_JCOMM_H
 #include <jni.h>
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 /**
  * This function binds the task associated with the communication to
  * the java communication object.
@@ -16,7 +20,7 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Comm_destroy(JNIEnv *env, jobject jcomm);
+Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm);
 
 JNIEXPORT jboolean JNICALL
 Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm);