diff options
| -rw-r--r-- | include/grpc/support/tls_gcc.h | 3 | ||||
| -rw-r--r-- | src/core/lib/iomgr/resolve_address_windows.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/grpc/support/tls_gcc.h b/include/grpc/support/tls_gcc.h index c926400e8e..136cb75dac 100644 --- a/include/grpc/support/tls_gcc.h +++ b/include/grpc/support/tls_gcc.h @@ -41,10 +41,11 @@ struct gpr_gcc_thread_local { /** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. * GPR_TLS_CLASS_DEF needs to be called to define this member. */ #define GPR_TLS_CLASS_DECL(name) \ - static bool name##_inited = false; \ + static bool name##_inited; \ static __thread struct gpr_gcc_thread_local name #define GPR_TLS_CLASS_DEF(name) \ + bool name##_inited = false; \ __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)} #define gpr_tls_init(tls) \ diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 4e2bc7b5ca..ccb1dae689 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -51,6 +51,7 @@ typedef struct { static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { + grpc_core::ExecCtx exec_ctx; struct addrinfo hints; struct addrinfo *result = NULL, *resp; char* host; |