diff options
| author | Grigoriy Chudnov <g.chudnov@gmail.com> | 2016-01-19 18:50:50 +0300 |
|---|---|---|
| committer | Grigoriy Chudnov <g.chudnov@gmail.com> | 2016-01-19 18:50:50 +0300 |
| commit | d196ca82518afb4fc2a7563d5c75d5172c6bd82e (patch) | |
| tree | b8a6eaeb51a3088be314c57206f99791471b836f /Rx | |
| parent | 063bec08bc305dbf97c3cabfbbb1ce846d2968ce (diff) | |
| download | RxCpp-d196ca82518afb4fc2a7563d5c75d5172c6bd82e.tar.gz | |
improve support for android
Diffstat (limited to 'Rx')
| -rw-r--r-- | Rx/v2/src/rxcpp/rx-includes.hpp | 6 | ||||
| -rw-r--r-- | Rx/v2/src/rxcpp/rx-util.hpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Rx/v2/src/rxcpp/rx-includes.hpp b/Rx/v2/src/rxcpp/rx-includes.hpp index bfec60a..c352a84 100644 --- a/Rx/v2/src/rxcpp/rx-includes.hpp +++ b/Rx/v2/src/rxcpp/rx-includes.hpp @@ -93,6 +93,10 @@ #endif #endif +#if defined(__ANDROID__) +#define RXCPP_ON_ANDROID +#endif + #pragma push_macro("min") #pragma push_macro("max") #undef min @@ -127,7 +131,7 @@ #include <typeinfo> #include <tuple> -#if defined(RXCPP_ON_IOS) +#if defined(RXCPP_ON_IOS) || defined(RXCPP_ON_ANDROID) #include <pthread.h> #endif diff --git a/Rx/v2/src/rxcpp/rx-util.hpp b/Rx/v2/src/rxcpp/rx-util.hpp index cd2b932..8b87175 100644 --- a/Rx/v2/src/rxcpp/rx-util.hpp +++ b/Rx/v2/src/rxcpp/rx-util.hpp @@ -7,7 +7,7 @@ #include "rx-includes.hpp" -#if !defined(RXCPP_ON_IOS) && !defined(RXCPP_THREAD_LOCAL) +#if !defined(RXCPP_ON_IOS) && !defined(RXCPP_ON_ANDROID) && !defined(RXCPP_THREAD_LOCAL) #if defined(_MSC_VER) #define RXCPP_THREAD_LOCAL __declspec(thread) #else |