diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-04 17:08:12 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-04 17:08:12 -0700 |
| commit | 5de46568cec21615d8ce30b7d32d8d91effc5fef (patch) | |
| tree | 666b5ec38cd6ced699e361f9ba22aa500429d834 /include | |
| parent | 895653bc020a1862be7393fde31e48eb90df0e64 (diff) | |
| parent | 500e361826cb52a6d8db6839dc209dcf3266df0f (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/atm_gcc_atomic.h | 1 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/atm_gcc_sync.h | 1 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/atm_windows.h | 1 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 3 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 2 | ||||
| -rw-r--r-- | include/grpc/support/tls.h | 2 |
6 files changed, 9 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/atm_gcc_atomic.h b/include/grpc/impl/codegen/atm_gcc_atomic.h index a486258c77..d52975ce97 100644 --- a/include/grpc/impl/codegen/atm_gcc_atomic.h +++ b/include/grpc/impl/codegen/atm_gcc_atomic.h @@ -39,6 +39,7 @@ #include <grpc/impl/codegen/port_platform.h> typedef intptr_t gpr_atm; +#define GPR_ATM_MAX INTPTR_MAX #ifdef GPR_LOW_LEVEL_COUNTERS extern gpr_atm gpr_counter_atm_cas; diff --git a/include/grpc/impl/codegen/atm_gcc_sync.h b/include/grpc/impl/codegen/atm_gcc_sync.h index 946545a671..b537e48f0f 100644 --- a/include/grpc/impl/codegen/atm_gcc_sync.h +++ b/include/grpc/impl/codegen/atm_gcc_sync.h @@ -39,6 +39,7 @@ #include <grpc/impl/codegen/port_platform.h> typedef intptr_t gpr_atm; +#define GPR_ATM_MAX INTPTR_MAX #define GPR_ATM_COMPILE_BARRIER_() __asm__ __volatile__("" : : : "memory") diff --git a/include/grpc/impl/codegen/atm_windows.h b/include/grpc/impl/codegen/atm_windows.h index 0ab70b95c4..b8f63da758 100644 --- a/include/grpc/impl/codegen/atm_windows.h +++ b/include/grpc/impl/codegen/atm_windows.h @@ -38,6 +38,7 @@ #include <grpc/impl/codegen/port_platform.h> typedef intptr_t gpr_atm; +#define GPR_ATM_MAX INTPTR_MAX #define gpr_atm_full_barrier MemoryBarrier diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index aa4210b1a7..5beac83a3b 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -152,6 +152,9 @@ typedef struct { #define GRPC_ARG_ENABLE_CENSUS "grpc.census" /** If non-zero, enable load reporting. */ #define GRPC_ARG_ENABLE_LOAD_REPORTING "grpc.loadreporting" +/** Request that optional features default to off (regardless of what they + usually default to) - to enable tight control over what gets enabled */ +#define GRPC_ARG_MINIMAL_STACK "grpc.minimal_stack" /** Maximum number of concurrent incoming streams to allow on a http2 connection. Int valued. */ #define GRPC_ARG_MAX_CONCURRENT_STREAMS "grpc.max_concurrent_streams" diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 086394648f..d525083cd0 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -375,8 +375,10 @@ typedef unsigned __int64 uint64_t; #ifndef GRPC_MUST_USE_RESULT #if defined(__GNUC__) && !defined(__MINGW32__) #define GRPC_MUST_USE_RESULT __attribute__((warn_unused_result)) +#define GPR_ALIGN_STRUCT(n) __attribute__((aligned(n))) #else #define GRPC_MUST_USE_RESULT +#define GPR_ALIGN_STRUCT(n) #endif #endif diff --git a/include/grpc/support/tls.h b/include/grpc/support/tls.h index a45e1f0a4d..5365449f0d 100644 --- a/include/grpc/support/tls.h +++ b/include/grpc/support/tls.h @@ -58,7 +58,7 @@ gpr_tls_set(&foo, new_value); Accessing a thread local: - current_value = gpr_tls_get(&foo, value); + current_value = gpr_tls_get(&foo); ALL functions here may be implemented as macros. */ |