diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-07-25 14:45:41 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-25 14:45:41 -0700 |
| commit | 01da196879cb69b3c56b3bdcff6f0194ab5a190d (patch) | |
| tree | 766749fde4a5b74eabe1df92ebb3f65d0df70935 /include | |
| parent | cc961b6c5a47622f8b14039f13d80d898a70b947 (diff) | |
| parent | 1533e6aab9372d1f3eb667e6d4307eb2e1ee9b3f (diff) | |
Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master
V1.0.x merge 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 * } } |