java: Included jni.h in an external header
The reason for this is that applications that use mraa, like upm, need the definitions contained in jni header. Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com> Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
committed by
Brendan Le Foll
parent
029e08669c
commit
53058d500b
@@ -44,6 +44,13 @@ extern "C" {
|
|||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
|
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
|
||||||
|
#include <jni.h>
|
||||||
|
extern "C" {
|
||||||
|
void mraa_java_isr_callback(void *args);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Opaque pointer definition to the internal struct _gpio
|
* Opaque pointer definition to the internal struct _gpio
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -28,13 +28,6 @@
|
|||||||
#include "types.hpp"
|
#include "types.hpp"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
|
|
||||||
extern "C" {
|
|
||||||
void mraa_java_isr_callback(void *args);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(SWIGJAVASCRIPT)
|
#if defined(SWIGJAVASCRIPT)
|
||||||
#if NODE_MODULE_VERSION >= 0x000D
|
#if NODE_MODULE_VERSION >= 0x000D
|
||||||
#include <uv.h>
|
#include <uv.h>
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "jni.h"
|
#include <jni.h>
|
||||||
#include "mraa/types.h"
|
#include "mraa/types.h"
|
||||||
|
|
||||||
// location for defining JNI version to use
|
// location for defining JNI version to use
|
||||||
|
|||||||
Reference in New Issue
Block a user