diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-07-22 11:00:34 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-07-22 11:00:34 -0700 |
| commit | 316f73f6c15334575c98255b2feba70d1ec73193 (patch) | |
| tree | 011f29c23ae4bb1ee9bf0a09051bc9161048b460 /include | |
| parent | c03c575c8664ebd493bbab6c71b04f22ee9a274c (diff) | |
| parent | 89a8851e6856be9b90af5db0ffdc4bc4adb1b3e1 (diff) | |
Merge v1.0.x into master
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 2 | ||||
| -rw-r--r-- | include/grpc/module.modulemap | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 3ad665a7a2..7c67bad5ae 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -119,7 +119,7 @@ // libraries; it should be integrated with the `__linux__` definitions below. #define GPR_PLATFORM_STRING "manylinux" #define GPR_POSIX_CRASH_HANDLER 1 -#define GPR_CPU_LINUX 1 +#define GPR_CPU_POSIX 1 #define GPR_GCC_ATOMIC 1 #define GPR_GCC_TLS 1 #define GPR_LINUX 1 diff --git a/include/grpc/module.modulemap b/include/grpc/module.modulemap index ae11a78b74..02fb2f39b2 100644 --- a/include/grpc/module.modulemap +++ b/include/grpc/module.modulemap @@ -1,5 +1,15 @@ framework module grpc { umbrella header "grpc.h" + + header "byte_buffer_reader.h" + header "grpc_security.h" + header "grpc_security_constants.h" + header "impl/codegen/alloc.h" + header "impl/codegen/byte_buffer_reader.h" + header "support/alloc.h" + header "support/port_platform.h" + header "support/string_util.h" + export * module * { export * } } |