From 5d587ea301030bff2351af0d269410af9c6ad1fc Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 22 Jan 2022 16:35:07 +0900 Subject: [PATCH] megacmd: Use `__TERMUX__` identifier --- packages/megacmd/sdk-src-posix-fs.cpp.patch | 4 ++-- packages/megacmd/sdk-src-posix-net.cpp.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/megacmd/sdk-src-posix-fs.cpp.patch b/packages/megacmd/sdk-src-posix-fs.cpp.patch index 71ba1efc0..81f18d777 100644 --- a/packages/megacmd/sdk-src-posix-fs.cpp.patch +++ b/packages/megacmd/sdk-src-posix-fs.cpp.patch @@ -5,7 +5,7 @@ #endif -#ifdef __ANDROID__ -+#ifdef __ANDROID_NO_TERMUX__ ++#if defined __ANDROID__ && !defined __TERMUX__ #include 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"; diff --git a/packages/megacmd/sdk-src-posix-net.cpp.patch b/packages/megacmd/sdk-src-posix-net.cpp.patch index 24cb6b32d..368bbf8d5 100644 --- a/packages/megacmd/sdk-src-posix-net.cpp.patch +++ b/packages/megacmd/sdk-src-posix-net.cpp.patch @@ -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 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)