diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-23 16:07:42 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-23 16:07:42 -0700 |
| commit | e308104390031da79237a1d00d387276f7edc003 (patch) | |
| tree | 51a4096f704ddf24593eb22f38cb4ba072dd0ed6 /libcutils | |
| parent | ddccd24f446797cfc3455f309d55c54183b64b53 (diff) | |
| download | system_core-e308104390031da79237a1d00d387276f7edc003.zip system_core-e308104390031da79237a1d00d387276f7edc003.tar.gz system_core-e308104390031da79237a1d00d387276f7edc003.tar.bz2 | |
Undo mac fix to fix windows, fix mac differently.
Change-Id: I7d1ee439d25e17c31c0be448e67a90a0f626ff42
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 2 | ||||
| -rw-r--r-- | libcutils/threads.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 876b89d..2c5e351 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -68,7 +68,7 @@ endif # ======================================================== LOCAL_MODULE := libcutils LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c -LOCAL_STATIC_LIBRARIES := liblog libbase +LOCAL_STATIC_LIBRARIES := liblog ifneq ($(HOST_OS),windows) LOCAL_CFLAGS += -Werror endif diff --git a/libcutils/threads.c b/libcutils/threads.c index cafeff7..d901619 100644 --- a/libcutils/threads.c +++ b/libcutils/threads.c @@ -23,7 +23,6 @@ #include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED #include <sys/syscall.h> #include <sys/time.h> -#include "base/logging.h" #elif defined(__linux__) && !defined(__ANDROID__) #include <syscall.h> #include <unistd.h> @@ -61,7 +60,10 @@ extern void thread_store_set( thread_store_t* store, pid_t gettid() { #if defined(__APPLE__) uint64_t owner; - CHECK_PTHREAD_CALL(pthread_threadid_np, (NULL, &owner), __FUNCTION__); + int rc = pthread_threadid_np(NULL, &owner); + if (rc != 0) { + abort(); + } return owner; #elif defined(__linux__) return syscall(__NR_gettid); |