android: Change preprocessor define to standard __ANDROID__

ANDROID is only standard to the old Makefile buildsystem, not the platform.
This commit is contained in:
Florent Castelli committed 2016-10-12 11:14:09 +02:00
1 parent 4f655f8f3c
commit 70593d1004
54 files changed
+119 -123

No files matched your search

+3 -3
View File
@@ -1,7 +1,7 @@
#ifdef _WIN32
#include <windows.h>
#define TLS_SUPPORTED
#elif defined(ANDROID)
#elif defined(__ANDROID__)
#define TLS_SUPPORTED
#endif
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "thread/threadutil.h"
#ifdef ANDROID
#ifdef __ANDROID__
#include <pthread.h>
#endif
@@ -43,7 +43,7 @@ void setCurrentThreadName(const char* threadName) {
{}
#else
#if defined(ANDROID)
#if defined(__ANDROID__)
pthread_setname_np(pthread_self(), threadName);
// #else
// pthread_setname_np(thread_name);