X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc970a2e444049bfa014679e0d987e2366589300..4664c9757fb743652b03460ca4a08957cc0a249d:/src/java/jmsg.c diff --git a/src/java/jmsg.c b/src/java/jmsg.c index c55aab6098..d40d249d78 100644 --- a/src/java/jmsg.c +++ b/src/java/jmsg.c @@ -23,34 +23,10 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg,"MSG for Java(TM)"); -/* header for windows */ -#ifdef WIN32 -#include -#else -#include -#endif - #include "jmsg.h" static JavaVM * __java_vm = NULL; - -#ifdef WIN32 - static DWORD __current_thread_id = 0; - - int is_main_thread() { - return (GetCurrentThreadId() == __current_thread_id); - } - -#else /* !WIN32 */ - - static pthread_t __current_thread_id = 0; - - int is_main_thread() { - return (pthread_self() == __current_thread_id); - } -#endif - JavaVM * get_java_VM(void) { return __java_vm; @@ -1061,13 +1037,7 @@ Java_simgrid_msg_Msg_init(JNIEnv* env, jclass cls, jobjectArray jargs) { free(argv); -#ifdef WIN32 - __current_thread_id = GetCurrentThreadId(); -#else - __current_thread_id = pthread_self(); -#endif - -(*env)->GetJavaVM(env,&__java_vm); + (*env)->GetJavaVM(env,&__java_vm); }