diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-04-23 00:45:07 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-04-23 00:45:33 +0300 |
| commit | 38d25fd5b9be25074c7d39533082b4a50197601e (patch) | |
| tree | 634fbec9f0ee4ab69d3d6827afc5e73eef9d7e8d | |
| parent | fc3699996b318d44a91b6dcd2f4a5fdeb54116b9 (diff) | |
| download | libADLMIDI-38d25fd5b9be25074c7d39533082b4a50197601e.tar.gz libADLMIDI-38d25fd5b9be25074c7d39533082b4a50197601e.tar.bz2 libADLMIDI-38d25fd5b9be25074c7d39533082b4a50197601e.zip | |
Fixed Android build
| -rw-r--r-- | src/adlmidi_private.hpp | 2 | ||||
| -rw-r--r-- | src/chips/dosbox_opl3.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 0fabf35..fc54457 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -88,7 +88,7 @@ typedef int32_t ssize_t; #include <cstdarg> #include <cstdio> #include <cassert> -#if !(defined(__APPLE__) && defined(__GLIBCXX__)) +#if !(defined(__APPLE__) && defined(__GLIBCXX__)) && !defined(__ANDROID__) #include <cinttypes> //PRId32, PRIu32, etc. #else #include <inttypes.h> diff --git a/src/chips/dosbox_opl3.cpp b/src/chips/dosbox_opl3.cpp index 24c1c44..e748b85 100644 --- a/src/chips/dosbox_opl3.cpp +++ b/src/chips/dosbox_opl3.cpp @@ -5,14 +5,14 @@ DosBoxOPL3::DosBoxOPL3() : OPLChipBase(), - m_chip(nullptr) + m_chip(NULL) { reset(); } DosBoxOPL3::DosBoxOPL3(const DosBoxOPL3 &c) : OPLChipBase(c), - m_chip(nullptr) + m_chip(NULL) { setRate(c.m_rate); } |