aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/support
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-10-12 16:42:38 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-10-12 16:42:38 -0700
commitfba6475805eb85e781da0b1428869c72fe751b4e (patch)
tree9538a703c0688ab1b42808db887c77e9f163d596 /src/core/lib/support
parent9fc49c98634bc1b1f5844e670f4bb5e1965be551 (diff)
parenta1b726cdaf7ffee1d91aebc351535b22a6eac047 (diff)
Merge github.com:grpc/grpc into chttp2_timer
Diffstat (limited to 'src/core/lib/support')
-rw-r--r--src/core/lib/support/time_posix.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/support/time_posix.cc b/src/core/lib/support/time_posix.cc
index 3267ea6b54..3f8a9094fd 100644
--- a/src/core/lib/support/time_posix.cc
+++ b/src/core/lib/support/time_posix.cc
@@ -42,7 +42,7 @@ static struct timespec timespec_from_gpr(gpr_timespec gts) {
return rv;
}
-#if _POSIX_TIMERS > 0
+#if _POSIX_TIMERS > 0 || defined(__OpenBSD__)
static gpr_timespec gpr_from_timespec(struct timespec ts,
gpr_clock_type clock_type) {
/*