Merge branch 'node-object-jni' into jail

This commit is contained in:
Roman Volosovskyi 2016-06-24 17:53:35 +03:00
commit 997d5ca20b
1 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,6 @@
#include <jni.h> #include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <jni.h>
bool GethServiceSignalEvent( const char *jsonEvent ); bool GethServiceSignalEvent( const char *jsonEvent );
@ -30,7 +29,8 @@ static bool JniAttach( JNIEnv **env )
if (status == JNI_EDETACHED) if (status == JNI_EDETACHED)
{ {
// attach thread to JNI // attach thread to JNI
(*gJavaVM)->AttachCurrentThread( gJavaVM, (void **)env, NULL ); //(*gJavaVM)->AttachCurrentThread( gJavaVM, (void **)env, NULL ); // Oracle JNI API
(*gJavaVM)->AttachCurrentThread( gJavaVM, env, NULL ); // Android JNI API
return false; return false;
} }
else if (status != JNI_OK) else if (status != JNI_OK)