diff --git a/mkvmuxerutil.cpp b/mkvmuxerutil.cpp
index 27ab15d..8949c85 100644
--- a/mkvmuxerutil.cpp
+++ b/mkvmuxerutil.cpp
@@ -10,6 +10,7 @@
 
 #ifdef __ANDROID__
 #include <fcntl.h>
+#include <unistd.h>
 #endif
 
 #include <cassert>
diff --git a/mkvparser.cpp b/mkvparser.cpp
index 4f20148..9cc6971 100644
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -4034,7 +4034,7 @@ long SegmentInfo::Parse() {
   }
 
   const double rollover_check = m_duration * m_timecodeScale;
-  if (rollover_check > LLONG_MAX)
+  if (rollover_check > static_cast<double>(LLONG_MAX))
     return E_FILE_FORMAT_INVALID;
 
   if (pos != stop)