Merge branch 'master' into mc

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

diff --git a/src/bindings/java/jmsg_comm.c b/src/bindings/java/jmsg_comm.c
index 669e91f..2de313c 100644 (file)
--- a/src/bindings/java/jmsg_comm.c
+++ b/src/bindings/java/jmsg_comm.c
@@ -1,11 +1,16 @@
-/* Functions related to the java comm instances                                                                                                                                */
+/* Functions related to the java comm instances                             */
+
+/* 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. */
 
-/* Copyright (c) 2012. The SimGrid Team. All rights reserved.                   */
 #include "jmsg_comm.h"
 #include "jxbt_utilities.h"
 #include "jmsg.h"
 
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
 static jfieldID jcomm_field_Comm_bind;
@@ -57,7 +62,7 @@ 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) {
   msg_comm_t comm;
   msg_task_t *task_received;