Merge pull request #9042 from unknownbrackets/android

Undo arm64 fix: was a local problem, after all
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2016-10-10 09:09:27 +02:00
commit ba2789974e
2 files changed
+1 -6

No files matched your search

-4
View File
@@ -23,10 +23,6 @@
#if defined(__APPLE__) || defined(__SYMBIAN32__)
#define __thread
#endif
// Experiencing emutls crashes on ARM64 Android, so disabling for now.
#if defined(ANDROID) && !defined(ARM64)
#define __thread
#endif
#ifdef _WIN32
#include "CommonWindows.h"
+1 -2
View File
@@ -1,8 +1,7 @@
#ifdef _WIN32
#include <windows.h>
#define TLS_SUPPORTED
// Experiencing emutls crashes on ARM64 Android, so disabling for now.
#elif defined(ANDROID) && !defined(ARM64)
#elif defined(ANDROID)
#define TLS_SUPPORTED
#endif