diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
| commit | 5b9e7430d9e056b393ea6aec199260d763840ba5 (patch) | |
| tree | eec1d00f3f8c41435d7732d6694f8eca4d7b30ec /include | |
| parent | f7670f3054e4ed05715120728e345e4bb0a13d3d (diff) | |
| parent | ad21fea239769e2a3be14ac56ee747eb0f3c13a3 (diff) | |
Merge github.com:grpc/grpc into bye-bye-completion-queue-pie
Conflicts:
vsprojects/Grpc.mak
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/support/tls.h | 8 | ||||
| -rw-r--r-- | include/grpc/support/tls_msvc.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/grpc/support/tls.h b/include/grpc/support/tls.h index 8dffd52255..7a7143c6d1 100644 --- a/include/grpc/support/tls.h +++ b/include/grpc/support/tls.h @@ -34,7 +34,7 @@ #ifndef GRPC_SUPPORT_TLS_H #define GRPC_SUPPORT_TLS_H -#include "port_platform.h" +#include <grpc/support/port_platform.h> /* Thread local storage. @@ -63,15 +63,15 @@ ALL functions here may be implemented as macros. */ #ifdef GPR_GCC_TLS -#include "tls_gcc.h" +#include <grpc/support/tls_gcc.h> #endif #ifdef GPR_MSVC_TLS -#include "tls_msvc.h" +#include <grpc/support/tls_msvc.h> #endif #ifdef GPR_PTHREAD_TLS -#include "tls_pthread.h" +#include <grpc/support/tls_pthread.h> #endif #endif diff --git a/include/grpc/support/tls_msvc.h b/include/grpc/support/tls_msvc.h index e574c11884..526aeeacdf 100644 --- a/include/grpc/support/tls_msvc.h +++ b/include/grpc/support/tls_msvc.h @@ -42,7 +42,7 @@ struct gpr_msvc_thread_local { }; #define GPR_TLS_DECL(name) \ - static __thread struct gpr_msvc_thread_local name = {0} + static __declspec(thread) struct gpr_msvc_thread_local name = {0} #define gpr_tls_init(tls) do {} while (0) #define gpr_tls_destroy(tls) do {} while (0) |