From d44c4c73182cc21d6984e0188c4e45e0350b6e7a Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Mon, 23 Apr 2018 00:45:07 +0300
Subject: Fixed Android build

---
 src/adlmidi_private.hpp   | 2 +-
 src/chips/dosbox_opl3.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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);
 }
-- 
cgit v1.2.3