From 8b9267c253e781aedc0025b65ab24e078d3ab0a2 Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Fri, 14 Aug 2015 18:15:33 +0300 Subject: [PATCH] java: eliminated SWIGTYPE_p_mraa_result_t Signed-off-by: Stefan Andritoiu Signed-off-by: Mihai Tudor Panu --- src/grove/javaupm_grove.i | 4 ++-- src/upm.i | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/grove/javaupm_grove.i b/src/grove/javaupm_grove.i index 02886472..f7a9b9bf 100644 --- a/src/grove/javaupm_grove.i +++ b/src/grove/javaupm_grove.i @@ -4,7 +4,7 @@ %{ #include "grove.h" %} - +/* %typemap(jni) mraa_result_t "jint" %typemap(jstype) mraa_result_t "int" %typemap(jtype) mraa_result_t "int" @@ -18,6 +18,6 @@ %typemap(out) mraa_result_t { $result = (int)$1; } - +*/ %include "grove.h" diff --git a/src/upm.i b/src/upm.i index 1e32f0e0..6ba93f92 100644 --- a/src/upm.i +++ b/src/upm.i @@ -2,8 +2,11 @@ %include "stdint.i" %include "upm_exception.i" -%typemap(out) mraa_result_t = int; -%apply int { speed_t }; + +#if (SWIGJAVA) + %apply int { speed_t }; + %apply int { mraa_result_t }; +#endif #if (SWIG_JAVASCRIPT_V8) %{