megacmd: Use `__TERMUX__` identifier

This commit is contained in:
Tee KOBAYASHI 2022-01-22 16:35:07 +09:00 committed by YAKSH BARIYA
parent 391bd4fd72
commit 5d587ea301
2 changed files with 5 additions and 5 deletions

View File

@ -5,7 +5,7 @@
#endif
-#ifdef __ANDROID__
+#ifdef __ANDROID_NO_TERMUX__
+#if defined __ANDROID__ && !defined __TERMUX__
#include <jni.h>
extern JavaVM *MEGAjvm;
#endif
@ -14,7 +14,7 @@
void PosixFileSystemAccess::statsid(string *id) const
{
-#ifdef __ANDROID__
+#ifdef __ANDROID_NO_TERMUX__
+#if defined __ANDROID__ && !defined __TERMUX__
if (!MEGAjvm)
{
LOG_err << "No JVM found";

View File

@ -5,7 +5,7 @@
#include "mega/logging.h"
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID_NO_TERMUX__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID__) && !defined(__TERMUX__) && ARES_VERSION >= 0x010F00
#include <jni.h>
extern JavaVM *MEGAjvm;
#endif
@ -14,7 +14,7 @@
}
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID_NO_TERMUX__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID__) && !defined(__TERMUX__) && ARES_VERSION >= 0x010F00
initialize_android();
#endif
@ -23,7 +23,7 @@
}
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID_NO_TERMUX__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID__) && !defined(__TERMUX__) && ARES_VERSION >= 0x010F00
void CurlHttpIO::initialize_android()
{
if (!MEGAjvm)