diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-02-03 23:29:32 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-02-05 16:10:10 -0800 |
| commit | 86cf941c480de8d5693a24d3feb45574f5c89a86 (patch) | |
| tree | ab2a1ea9396da91aab8b15ac37784c328527eede /base/logging.cpp | |
| parent | 9c551a1bece6624bdbdfca40badc07b40b28ec1c (diff) | |
| download | system_core-86cf941c480de8d5693a24d3feb45574f5c89a86.tar.gz system_core-86cf941c480de8d5693a24d3feb45574f5c89a86.tar.bz2 system_core-86cf941c480de8d5693a24d3feb45574f5c89a86.zip | |
Fix windows 64-bit builds
pid_t is 64-bit in 64-bit mingw, but the windows process/thread
functions return a DWORD(uint32_t). Instead of promoting to a pid_t and
fixing the format strings, just use a uint32_t to store the values.
android_thread_id also cannot be a 64-bit pointer, so for windows just
force it to be a uint32_t.
libutils/ProcessCallStack only works under Linux, since it makes heavy
use of /proc. Don't compile it under Windows or Darwin.
Bug: 26957718
Change-Id: I4e43e7cf18a96f22b3a9a08dbab8c3e960c12930
Diffstat (limited to 'base/logging.cpp')
| -rw-r--r-- | base/logging.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/logging.cpp b/base/logging.cpp index a385902e8..174187149 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -68,7 +68,13 @@ #include <windows.h> #endif -static pid_t GetThreadId() { +#if defined(_WIN32) +typedef uint32_t thread_id; +#else +typedef pid_t thread_id; +#endif + +static thread_id GetThreadId() { #if defined(__BIONIC__) return gettid(); #elif defined(__APPLE__) |