alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +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

5
src/rpr220/rpr220.cxx
View File

@ -26,7 +26,6 @@
#include "rpr220.h"
using namespace upm;
using namespace std;
@ -56,10 +55,10 @@ bool RPR220::blackDetected()
return (mraa_gpio_read(m_gpio) ? true : false);
}
#ifdef SWIGJAVA
#ifdef JAVACALLBACK
void RPR220::installISR(IsrCallback *cb)
{
installISR(generic_callback_isr, cb);
installISR(generic_callback_isr, cb);
}
#endif

6
src/rpr220/rpr220.h
View File

@ -26,7 +26,7 @@
#include <string>
#include <mraa/gpio.h>
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
#include "../IsrCallback.h"
#endif
@ -87,7 +87,7 @@ namespace upm {
*/
bool blackDetected();
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(IsrCallback *cb);
#else
/**
@ -108,7 +108,7 @@ namespace upm {
void uninstallISR();
private:
#ifdef SWIGJAVA
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(void (*isr)(void *), void *arg);
#endif
bool m_isrInstalled;