diff options
| -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); } |