diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-22 21:27:26 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-22 21:30:14 +0100 |
| commit | 1280fdb5741f459fbec6a8c73a92d1c4ada34849 (patch) | |
| tree | 2a37423f3c656fdfe76e97e9664c8567d75a3333 /src/core/support/time_posix.c | |
| parent | f37adb9451330aa82b689e0b3283f20de491a306 (diff) | |
| parent | 9f791595903b926e32b3d2ec5d959cfe1a3e1e78 (diff) | |
Merge branch 'master' into backport-merge
Diffstat (limited to 'src/core/support/time_posix.c')
| -rw-r--r-- | src/core/support/time_posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/support/time_posix.c b/src/core/support/time_posix.c index 1f92d7f090..36d75e7da2 100644 --- a/src/core/support/time_posix.c +++ b/src/core/support/time_posix.c @@ -86,7 +86,7 @@ gpr_timespec gpr_now(gpr_clock_type clock_type) { gpr_precise_clock_now(&ret); return ret; } else { -#if defined(__linux__) && !defined(GPR_NO_DIRECT_SYSCALLS) +#if defined(GPR_BACKWARDS_COMPATIBILITY_MODE) && defined(__linux__) /* avoid ABI problems by invoking syscalls directly */ syscall(SYS_clock_gettime, clockid_for_gpr_clock[clock_type], &now); #else |