A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
6a4a66e
..
2de313c
100644
(file)
--- a/
src/bindings/java/jmsg_comm.c
+++ b/
src/bindings/java/jmsg_comm.c
@@
-1,12
+1,16
@@
/* Functions related to the java comm instances */
/* Functions related to the java comm instances */
-/* Copyright (c) 2012-201
3
. The SimGrid Team.
+/* Copyright (c) 2012-201
4
. The SimGrid Team.
* All rights reserved. */
* 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. */
+
#include "jmsg_comm.h"
#include "jxbt_utilities.h"
#include "jmsg.h"
#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;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
static jfieldID jcomm_field_Comm_bind;
@@
-58,7
+62,7
@@
Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) {
}
JNIEXPORT void JNICALL
}
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;
msg_comm_t comm;
msg_task_t *task_received;