alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-06 11:51:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

java: Eliminated double definition of SWIGJAVA and the need for "#undefine SWIGJAVA"

Browse Source 
Signed-off-by: Stefan Andritoiu <stefan.andritoiu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

Conflicts:
	src/CMakeLists.txt
This commit is contained in:
Stefan Andritoiu
2015-09-14 18:10:12 +03:00
committed by Mihai Tudor Panu
parent f991bcf915
commit ef74a7b137
28 changed files with 34 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mma7660/mma7660.h
View File

@ -27,7 +27,7 @@
#include <mraa/i2c.h>
#include <mraa/gpio.h>
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
#include "../IsrCallback.h"
#endif
@ -169,7 +169,7 @@ namespace upm {
*/
void getRawValues(int *x, int *y, int *z);
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
/**
* Reads the current value of conversion
*
@ -187,7 +187,7 @@ namespace upm {
*/
void getAcceleration(float *ax, float *ay, float *az);
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
/**
* Gets the computed acceleration
*
@ -270,7 +270,7 @@ namespace upm {
* @param arg Pointer to an object to be supplied as an
* argument to the ISR.
*/
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(int pin, IsrCallback *cb);
#else
void installISR(int pin, void (*isr)(void *), void *arg);
@ -301,7 +301,7 @@ namespace upm {
bool setSampleRate(MMA7660_AUTOSLEEP_T sr);
private:
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(int pin, void (*isr)(void *), void *arg);
#endif