Merge pull request #630 from buffer51/develop

Fixed error in common.h for Android compilation introduced by e12cf11
This commit is contained in:
Zhang Xianyi 2015-09-04 13:01:01 -05:00
commit 40a3fed6b8
1 changed files with 3 additions and 1 deletions

View File

@ -413,8 +413,10 @@ typedef char* env_var_t;
#if !defined(RPCC_DEFINED) && !defined(OS_WINDOWS) #if !defined(RPCC_DEFINED) && !defined(OS_WINDOWS)
#ifdef _POSIX_MONOTONIC_CLOCK #ifdef _POSIX_MONOTONIC_CLOCK
#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 17) // don't require -lrt #if defined(__GLIBC_PREREQ) // cut the if condition if two lines, otherwise will fail at __GLIBC_PREREQ(2, 17)
#if __GLIBC_PREREQ(2, 17) // don't require -lrt
#define USE_MONOTONIC #define USE_MONOTONIC
#endif
#elif defined(OS_ANDROID) #elif defined(OS_ANDROID)
#define USE_MONOTONIC #define USE_MONOTONIC
#endif #endif