diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-01-13 10:16:35 -0800 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-01-13 10:16:35 -0800 |
| commit | d09122e51846d497b479a5e5072a775642cc32ae (patch) | |
| tree | 758c3385caf091f5a8b19bc8bffd200c12b99a93 /include | |
| parent | e93b028f07addb13240e636aaea837e3f0eaa9c4 (diff) | |
| parent | 6b6954050cf0379dbbee90dd18313a3779e0dd52 (diff) | |
Merge branch 'master' into tweak_slice_buffer
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 2 | ||||
| -rw-r--r-- | include/grpc/support/log_windows.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index cd989d664c..4633fa12e8 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -361,7 +361,7 @@ typedef unsigned __int64 uint64_t; #define GPR_MAX_ALIGNMENT 16 #ifndef GRPC_MUST_USE_RESULT -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__MINGW32__) #define GRPC_MUST_USE_RESULT __attribute__((warn_unused_result)) #else #define GRPC_MUST_USE_RESULT diff --git a/include/grpc/support/log_windows.h b/include/grpc/support/log_windows.h index 12bf8cc1f5..943a8e908b 100644 --- a/include/grpc/support/log_windows.h +++ b/include/grpc/support/log_windows.h @@ -34,6 +34,8 @@ #ifndef GRPC_SUPPORT_LOG_WINDOWS_H #define GRPC_SUPPORT_LOG_WINDOWS_H +#include <grpc/impl/codegen/port_platform.h> + #ifdef __cplusplus extern "C" { #endif |