luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: rework android detection (#1094)

Browse Source
This commit is contained in:
Sergiu Deitsch 2024-04-22 00:47:36 +02:00 committed by GitHub
parent 31429d85b8
commit 2b36dfe444
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/glog/platform.h
View File

@ -39,8 +39,9 @@
#elif defined(__CYGWIN__) || defined(__CYGWIN32__) #elif defined(__CYGWIN__) || defined(__CYGWIN32__)
# define GLOG_OS_CYGWIN # define GLOG_OS_CYGWIN
#elif defined(linux) || defined(__linux) || defined(__linux__) #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 # endif
#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
# define GLOG_OS_MACOSX # define GLOG_OS_MACOSX
@ -52,8 +53,6 @@
# define GLOG_OS_OPENBSD # define GLOG_OS_OPENBSD
#elif defined(__EMSCRIPTEN__) #elif defined(__EMSCRIPTEN__)
# define GLOG_OS_EMSCRIPTEN # define GLOG_OS_EMSCRIPTEN
#elif defined(__ANDROID__)
# define GLOG_OS_ANDROID
#else #else
// TODO(hamaji): Add other platforms. // TODO(hamaji): Add other platforms.
#error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github.