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
[LUA] Fixed compile time warnings, 2/2
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg.h
diff --git
a/src/bindings/java/jmsg.h
b/src/bindings/java/jmsg.h
index
4d9a5d4
..
75ad3db
100644
(file)
--- a/
src/bindings/java/jmsg.h
+++ b/
src/bindings/java/jmsg.h
@@
-1,16
+1,21
@@
/* Java Wrappers to the MSG API. */
/* Java Wrappers to the MSG API. */
-/* Copyright (c) 2007-201
2
. The SimGrid Team.
+/* Copyright (c) 2007-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef MSG4JAVA_H
#define MSG4JAVA_H
#ifndef MSG4JAVA_H
#define MSG4JAVA_H
-#include <
msg
/msg.h>
+#include <
simgrid
/msg.h>
#include <jni.h>
#include <jni.h>
+SG_BEGIN_DECL()
+
+extern int JAVA_HOST_LEVEL;
+extern int JAVA_STORAGE_LEVEL;
+
JavaVM *get_java_VM(void);
JNIEnv *get_current_thread_env(void);
/**
JavaVM *get_java_VM(void);
JNIEnv *get_current_thread_env(void);
/**
@@
-35,6
+40,9
@@
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_energyInit(void);
+
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass,
jstring);
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass,
jstring);
@@
-62,4
+70,6
@@
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
jstring jdeploymentFile);
Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
jstring jdeploymentFile);
+SG_END_DECL()
+
#endif /* !MSG4JAVA_H */
#endif /* !MSG4JAVA_H */