From c758542df614481b9c33a331dd993b42e7e4f643 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 27 Feb 2017 07:27:07 -0800 Subject: [PATCH] Fix compile --- src/core/lib/iomgr/timer_generic.c | 2 +- src/core/lib/support/spinlock.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/lib/iomgr/timer_generic.c b/src/core/lib/iomgr/timer_generic.c index 09ff2d0c3c5..d4df96c214d 100644 --- a/src/core/lib/iomgr/timer_generic.c +++ b/src/core/lib/iomgr/timer_generic.c @@ -70,7 +70,7 @@ typedef struct { /* Protects g_shard_queue */ static gpr_mu g_mu; /* Allow only one run_some_expired_timers at once */ -static gpr_spinlock g_checker_mu = GPR_SPINLOCK_INITIALIZER; +static gpr_spinlock g_checker_mu = GPR_SPINLOCK_STATIC_INITIALIZER; static gpr_clock_type g_clock_type; static shard_type g_shards[NUM_SHARDS]; /* Protected by g_mu */ diff --git a/src/core/lib/support/spinlock.h b/src/core/lib/support/spinlock.h index aeb5622726f..06c45de84be 100644 --- a/src/core/lib/support/spinlock.h +++ b/src/core/lib/support/spinlock.h @@ -41,6 +41,8 @@ typedef struct { gpr_atm atm; } gpr_spinlock; #define GPR_SPINLOCK_INITIALIZER ((gpr_spinlock){0}) +#define GPR_SPINLOCK_STATIC_INITIALIZER \ + { 0 } #define gpr_spinlock_trylock(lock) (gpr_atm_acq_cas(&(lock)->atm, 0, 1)) #define gpr_spinlock_unlock(lock) (gpr_atm_rel_store(&(lock)->atm, 0)) #define gpr_spinlock_lock(lock) \