commit 2b36dfe444ddde10bae8b79e44209918f58657f1
author Sergiu Deitsch <sergiud@users.noreply.github.com> Mon Apr 22 00:47:36 2024 +0200
committer GitHub <noreply@github.com> Mon Apr 22 00:47:36 2024 +0200
tree fa9abe762b7ac875bd763fe2d815d9de55995d9d
parent 31429d85b8ffad6027dcf821242687f3c6c85df9

fix: rework android detection (#1094)

src/glog/platform.h

diff --git a/src/glog/platform.h b/src/glog/platform.h
index 4aaf5b0..efb6ff9 100644
--- a/src/glog/platform.h
+++ b/src/glog/platform.h
@@ -39,8 +39,9 @@
 #elif defined(__CYGWIN__) || defined(__CYGWIN32__)
 #  define GLOG_OS_CYGWIN
 #elif defined(linux) || defined(__linux) || defined(__linux__)
-#  ifndef GLOG_OS_LINUX
-#    define GLOG_OS_LINUX
+#  define GLOG_OS_LINUX
+#  if defined(__ANDROID__)
+#    define GLOG_OS_ANDROID
 #  endif
 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
 #  define GLOG_OS_MACOSX
@@ -52,8 +53,6 @@
 #  define GLOG_OS_OPENBSD
 #elif defined(__EMSCRIPTEN__)
 #  define GLOG_OS_EMSCRIPTEN
-#elif defined(__ANDROID__)
-#  define GLOG_OS_ANDROID
 #else
 // TODO(hamaji): Add other platforms.
 #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github.