21 lines
670 B
Diff
21 lines
670 B
Diff
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/common.cc
|
|
+++ b/toolkit/components/protobuf/src/google/protobuf/stubs/common.cc
|
|
@@ -45,7 +45,7 @@
|
|
#include <windows.h>
|
|
#define snprintf _snprintf // see comment in strutil.cc
|
|
#endif
|
|
-#if defined(__ANDROID__)
|
|
+#if defined(__ANDROID__) && !defined(__TERMUX__)
|
|
#include <android/log.h>
|
|
#endif
|
|
|
|
@@ -121,7 +121,7 @@
|
|
|
|
namespace internal {
|
|
|
|
-#if defined(__ANDROID__)
|
|
+#if defined(__ANDROID__) && !defined(__TERMUX__)
|
|
inline void DefaultLogHandler(LogLevel level, const char* filename, int line,
|
|
const std::string& message) {
|
|
if (level < GOOGLE_PROTOBUF_MIN_LOG_LEVEL) {
|