diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-20 03:32:44 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-20 03:32:44 +0000 |
| commit | 0d958d200e301492abe31b498f094c23bbbb325c (patch) | |
| tree | 25431c13634f0871f4af7a1003fe292535a400eb /src/python | |
| parent | 34da2eeb42bf27ea4b292869822a721e273a1468 (diff) | |
| parent | eb44079fcd452e2f94066ffe0944c1390987b45e (diff) | |
Merge github.com:grpc/grpc into grpc_millis
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi | 2 | ||||
| -rw-r--r-- | src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi index 28cf114451..840af5c43a 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi @@ -523,7 +523,7 @@ cdef extern from "grpc/compression.h": int grpc_compression_algorithm_parse( grpc_slice value, grpc_compression_algorithm *algorithm) nogil int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm, - char **name) nogil + const char **name) nogil grpc_compression_algorithm grpc_compression_algorithm_for_level( grpc_compression_level level, uint32_t accepted_encodings) nogil void grpc_compression_options_init(grpc_compression_options *opts) nogil diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi index 0a2a6eee05..d860173b5d 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi @@ -782,7 +782,7 @@ cdef class CompressionOptions: def compression_algorithm_name(grpc_compression_algorithm algorithm): - cdef char* name + cdef const char* name with nogil: grpc_compression_algorithm_name(algorithm, &name) # Let Cython do the right thing with string casting |