diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-22 21:41:31 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-22 21:41:31 -0800 |
| commit | 6895168e0ac19699f2a1e35cbf094a5477f00ca7 (patch) | |
| tree | 322191a335da99badc2411254499575533ba8bb5 /src/core/iomgr/iomgr.c | |
| parent | b88e962d64495fd6e6896f1ffaff1def43bd95a5 (diff) | |
| parent | 30e9de8099ead2ca6e6d2dcd14df6d3c808bed18 (diff) | |
Merge github.com:grpc/grpc into filter-selection
Diffstat (limited to 'src/core/iomgr/iomgr.c')
| -rw-r--r-- | src/core/iomgr/iomgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index 212ce5534d..04580150f3 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <grpc/support/thd.h> #include "src/core/iomgr/iomgr_internal.h" -#include "src/core/iomgr/timer_internal.h" +#include "src/core/iomgr/timer.h" #include "src/core/support/string.h" static gpr_mu g_mu; |