Skip to content

Commit 40a3fed

Browse files
committed
Merge pull request #630 from buffer51/develop
Fixed error in common.h for Android compilation introduced by e12cf11
2 parents 5408074 + 2297a2d commit 40a3fed

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

common.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,10 @@ typedef char* env_var_t;
413413

414414
#if !defined(RPCC_DEFINED) && !defined(OS_WINDOWS)
415415
#ifdef _POSIX_MONOTONIC_CLOCK
416-
#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 17) // don't require -lrt
416+
#if defined(__GLIBC_PREREQ) // cut the if condition if two lines, otherwise will fail at __GLIBC_PREREQ(2, 17)
417+
#if __GLIBC_PREREQ(2, 17) // don't require -lrt
417418
#define USE_MONOTONIC
419+
#endif
418420
#elif defined(OS_ANDROID)
419421
#define USE_MONOTONIC
420422
#endif

0 commit comments

Comments
 (0)