ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error when building with uClibc-ng for ARM 

The uClibc-ng C library defines a type called R0 when compiling for ARM,
that conflits with a global variable called R0 from PaddleReader.cxx.

src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol
   R0 = 1.5e3,
   ^
/home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3: note: previous declaration ‘<anonymous enum> R0’
   R0 = 0,
   ^~

So let's redefine R0 as a private member of the PaddleReader class.

Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
This commit is contained in:
Sergio Prado 2017-09-09 15:04:58 -03:00 committed by Stephen Anthony
parent 2dc355b0d5
commit 391601d238
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emucore/tia/PaddleReader.cxx
View File

@ -22,7 +22,6 @@
static constexpr double
C = 68e-9,
RPOT = 1e6,
R0 = 1.5e3,
USUPP = 5;
static constexpr double TRIPPOINT_LINES = 379;

2
src/emucore/tia/PaddleReader.hxx
View File

@ -65,6 +65,8 @@ class PaddleReader : public Serializable
bool myIsDumped;
static constexpr double R0 = 1.5e3;
private:
PaddleReader(const PaddleReader&) = delete;
PaddleReader(PaddleReader&&) = delete;