diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-21 22:26:11 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-21 22:26:11 -0700 |
| commit | 2c15a0ea217db4b2075109724686d936563c972a (patch) | |
| tree | 652e98c6c622235bb0648055a3555c7cd6971f93 | |
| parent | 5d4992346a6010f89ba75caf5865885864bc0bc0 (diff) | |
| parent | 91e97b84cc0fd37362f4b80ecd5492812050a03f (diff) | |
Merge pull request #1340 from zeliard/master
add missing defines on windows (WIN64)
| -rw-r--r-- | include/grpc/support/atm_win32.h | 2 | ||||
| -rw-r--r-- | include/grpc/support/port_platform.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/grpc/support/atm_win32.h b/include/grpc/support/atm_win32.h index 4a21b5b547..dcba4d433d 100644 --- a/include/grpc/support/atm_win32.h +++ b/include/grpc/support/atm_win32.h @@ -73,7 +73,7 @@ static __inline int gpr_atm_no_barrier_cas(gpr_atm *p, gpr_atm o, gpr_atm n) { static __inline int gpr_atm_acq_cas(gpr_atm *p, gpr_atm o, gpr_atm n) { #ifdef GPR_ARCH_64 - return o == (gpr_atm)InterlockedCompareExchangeAcquire64((volatile LONGLONG) p, + return o == (gpr_atm)InterlockedCompareExchangeAcquire64((volatile LONGLONG *) p, (LONGLONG) n, (LONGLONG) o); #else return o == (gpr_atm)InterlockedCompareExchangeAcquire((volatile LONG *) p, diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h index 0bb3e16c8d..73eedddf44 100644 --- a/include/grpc/support/port_platform.h +++ b/include/grpc/support/port_platform.h @@ -45,8 +45,10 @@ #define GPR_WINSOCK_SOCKET 1 #ifdef __GNUC__ #define GPR_GCC_ATOMIC 1 +#define GPR_GCC_TLS 1 #else #define GPR_WIN32_ATOMIC 1 +#define GPR_MSVC_TLS 1 #endif #elif defined(_WIN32) || defined(WIN32) #define GPR_ARCH_32 1 |