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

6
src/lcd/eboled.h
View File

@ -26,13 +26,7 @@
#include <string>
#include <mraa/spi.hpp>
#ifdef SWIGJAVA
#undef SWIGJAVA
#include <mraa/gpio.hpp>
#define SWIGJAVA
#else
#include <mraa/gpio.hpp>
#endif
#include "lcd.h"
#include "ssd.h"

7
src/lcd/lcm1602.h
View File

@ -35,14 +35,7 @@
#include <string>
#include <mraa/i2c.hpp>
#ifdef SWIGJAVA
#undef SWIGJAVA
#include <mraa/gpio.hpp>
#define SWIGJAVA
#else
#include <mraa/gpio.hpp>
#endif
#include "lcd.h"