diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-12-06 22:29:12 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-12-06 22:29:12 -0800 |
| commit | 6043006af142fd2e10372ce5ef74f56b3064ce43 (patch) | |
| tree | 35b85d640b0e78e227a9f09f48ce06725b6aa7c1 /src/core/lib/iomgr/timer.h | |
| parent | 67454d71e833a7704d61e673ad32e71dd31c868a (diff) | |
| parent | 84d78acfa41a1263ba75b46dd4e857e02ea2cb96 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/lib/iomgr/timer.h')
| -rw-r--r-- | src/core/lib/iomgr/timer.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index cd8334eceb..b9acce229e 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -32,10 +32,6 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef struct grpc_timer grpc_timer; /* Initialize *timer. When expired or canceled, closure will be called with @@ -106,8 +102,4 @@ void grpc_timer_consume_kick(void); void grpc_kick_poller(void); -#ifdef __cplusplus -} -#endif - #endif /* GRPC_CORE_LIB_IOMGR_TIMER_H */ |