Unified · Split
| @@ -77,7 +77,8 @@ XThread::~XThread( ) · 76 unmodified lines | ||
| 77 | 77 | |
| 78 | 78 | if( thread != 0 && !is_self_thread) |
| 79 | 79 | { |
| 80 | −#if defined(__PLATFORM_MACOSX__) || defined(__PLATFORM_LINUX__) || defined(__WINDOWS_PTHREAD__) | |
| 80 | + // TODO: find an alternative for Android? | |
| 81 | +#if defined(__PLATFORM_MACOSX__) || ( defined(__PLATFORM_LINUX__) && !defined(__ANDROID__) ) || defined(__WINDOWS_PTHREAD__) | |
| 81 | 82 | pthread_cancel(thread); |
| 82 | 83 | pthread_join(thread, NULL); |
| 83 | 84 | #elif defined(__PLATFORM_WIN32__) |
| @@ -119,7 +120,8 @@ bool XThread::wait( long milliseconds, bool cancel ) · 35 unmodified lines | ||
| 119 | 120 | { |
| 120 | 121 | bool result = false; |
| 121 | 122 | |
| 122 | −#if ( defined(__PLATFORM_MACOSX__) || defined(__PLATFORM_LINUX__) || defined(__WINDOWS_PTHREAD__) ) | |
| 123 | + // TODO: find an alternative for Android? | |
| 124 | +#if ( defined(__PLATFORM_MACOSX__) || ( defined(__PLATFORM_LINUX__) && !defined(__ANDROID__) ) || defined(__WINDOWS_PTHREAD__) ) | |
| 123 | 125 | if(cancel) pthread_cancel(thread); |
| 124 | 126 | pthread_join(thread, NULL); |
| 125 | 127 | #elif defined(__PLATFORM_WIN32__) |
| @@ -146,7 +148,8 @@ bool XThread::wait( long milliseconds, bool cancel ) · 20 unmodified lines | ||
| 146 | 148 | //----------------------------------------------------------------------------- |
| 147 | 149 | void XThread :: test( ) |
| 148 | 150 | { |
| 149 | −#if ( defined(__PLATFORM_MACOSX__) || defined(__PLATFORM_LINUX__) || defined(__WINDOWS_PTHREAD__) ) | |
| 151 | + // TODO: find an alternative for Android? | |
| 152 | +#if ( defined(__PLATFORM_MACOSX__) || ( defined(__PLATFORM_LINUX__) && !defined(__ANDROID__) ) || defined(__WINDOWS_PTHREAD__) ) | |
| 150 | 153 | pthread_testcancel(); |
| 151 | 154 | #endif |
| 152 | 155 | } |