diff options
author | Dan Zhang <danzh@google.com> | 2017-12-01 15:58:47 -0500 |
---|---|---|
committer | Dan Zhang <danzh@google.com> | 2017-12-01 15:58:47 -0500 |
commit | 26024c801b5b171d448204507f2f10f76c93fe35 (patch) | |
tree | 6130826a0941f3fd1bb4ade0c73cfa013e497f83 /src/core/lib/iomgr/timer.h | |
parent | ec8a59e1125153fcf27eace15cdda8f975adf1c4 (diff) | |
parent | 0a6329c0a825ec36268d72c8fd2ac9a8296a25f0 (diff) |
Merge branch 'master' into asyncio
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 */ |