generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-05-03 07:52:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1983 from Bjoe/fix-#1836-android-compile-error

Browse Source 
Fix android build to fix #1836
This commit is contained in:
Günter Obiltschnig 2017-11-08 07:49:30 +01:00 committed by GitHub
commit 9fd471dc93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Foundation/src/Event_POSIX.cpp
View File

@ -24,12 +24,12 @@
// //
// Note: pthread_cond_timedwait() with CLOCK_MONOTONIC is supported // Note: pthread_cond_timedwait() with CLOCK_MONOTONIC is supported
// on Linux and QNX, as well as on Android >= 5.0. On Android < 5.0, // on Linux and QNX, as well as on Android >= 5.0 (API level 21).
// HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC is defined to indicate // On Android < 5.0, HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC is defined
// availability of non-standard pthread_cond_timedwait_monotonic(). // to indicate availability of non-standard pthread_cond_timedwait_monotonic().
// //
#ifndef POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT #ifndef POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT
#if (defined(__linux__) || defined(__QNX__)) && !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC)) #if (defined(__linux__) || defined(__QNX__)) && !(defined(__ANDROID__) && (defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC) || __ANDROID_API__ <= 21))
#define POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT 1 #define POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT 1
#endif #endif
#endif #endif

8
Foundation/src/Semaphore_POSIX.cpp
View File

@ -24,12 +24,12 @@
// //
// Note: pthread_cond_timedwait() with CLOCK_MONOTONIC is supported // Note: pthread_cond_timedwait() with CLOCK_MONOTONIC is supported
// on Linux and QNX, as well as on Android >= 5.0. On Android < 5.0, // on Linux and QNX, as well as on Android >= 5.0 (API level 21).
// HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC is defined to indicate // On Android < 5.0, HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC is defined
// availability of non-standard pthread_cond_timedwait_monotonic(). // to indicate availability of non-standard pthread_cond_timedwait_monotonic().
// //
#ifndef POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT #ifndef POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT
#if (defined(__linux__) || defined(__QNX__)) && !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC)) #if (defined(__linux__) || defined(__QNX__)) && !(defined(__ANDROID__) && (defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC) || __ANDROID_API__ <= 21))
#define POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT 1 #define POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT 1
#endif #endif
#endif #endif