diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-11-29 16:43:00 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-11-29 16:43:00 -0800 |
| commit | 14b27b847d8aecdc34c71d788670a4517313d651 (patch) | |
| tree | 0f5108d2c6c8c28936595f9b0ffe17f6a7e9d7b3 /src/core/lib/profiling | |
| parent | bf51c97fd67c0cefc49791b698b1baa0b5020bed (diff) | |
| parent | aa358d5e43d0a23301f79b1dcff292a480980769 (diff) | |
Merge commit 'aa358d5e43' into no-more-extern-c
Diffstat (limited to 'src/core/lib/profiling')
| -rw-r--r-- | src/core/lib/profiling/timers.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/lib/profiling/timers.h b/src/core/lib/profiling/timers.h index 8b6c254c21..9f11f771e6 100644 --- a/src/core/lib/profiling/timers.h +++ b/src/core/lib/profiling/timers.h @@ -19,10 +19,6 @@ #ifndef GRPC_CORE_LIB_PROFILING_TIMERS_H #define GRPC_CORE_LIB_PROFILING_TIMERS_H -#ifdef __cplusplus -extern "C" { -#endif - void gpr_timers_global_init(void); void gpr_timers_global_destroy(void); @@ -84,9 +80,6 @@ void gpr_timer_set_enabled(int enabled); #endif /* at least one profiler requested. */ -#ifdef __cplusplus -} - #if (defined(GRPC_STAP_PROFILER) + defined(GRPC_BASIC_PROFILER) + \ defined(GRPC_CUSTOM_PROFILER)) namespace grpc { @@ -111,6 +104,5 @@ class ProfileScope { do { \ } while (false) #endif -#endif #endif /* GRPC_CORE_LIB_PROFILING_TIMERS_H */ |