diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-31 07:49:58 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-31 07:49:58 -0700 |
| commit | 64a12c55dfe4bdbdb65b2c508a06f4335f100a98 (patch) | |
| tree | 27210a0df4e73a44487d89dc012502fa5d992ee4 /src/python | |
| parent | 6169d5f7b002a68daa3eda36798cec34de11d57f (diff) | |
| parent | 6fa2ce56f3600b044d9e27897823de736e948a73 (diff) | |
Merge github.com:grpc/grpc into copyright-fix
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc/_cython/imports.generated.h | 2 | ||||
| -rw-r--r-- | src/python/grpcio/precompiled.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc/_cython/imports.generated.h b/src/python/grpcio/grpc/_cython/imports.generated.h index 4d18369e1f..adcd8e954a 100644 --- a/src/python/grpcio/grpc/_cython/imports.generated.h +++ b/src/python/grpcio/grpc/_cython/imports.generated.h @@ -283,7 +283,7 @@ extern grpc_call_destroy_type grpc_call_destroy_import; typedef grpc_call_error(*grpc_server_request_call_type)(grpc_server *server, grpc_call **call, grpc_call_details *details, grpc_metadata_array *request_metadata, grpc_completion_queue *cq_bound_to_call, grpc_completion_queue *cq_for_notification, void *tag_new); extern grpc_server_request_call_type grpc_server_request_call_import; #define grpc_server_request_call grpc_server_request_call_import -typedef void *(*grpc_server_register_method_type)(grpc_server *server, const char *method, const char *host); +typedef void *(*grpc_server_register_method_type)(grpc_server *server, const char *method, const char *host, uint32_t flags); extern grpc_server_register_method_type grpc_server_register_method_import; #define grpc_server_register_method grpc_server_register_method_import typedef grpc_call_error(*grpc_server_request_registered_call_type)(grpc_server *server, void *registered_method, grpc_call **call, gpr_timespec *deadline, grpc_metadata_array *request_metadata, grpc_byte_buffer **optional_payload, grpc_completion_queue *cq_bound_to_call, grpc_completion_queue *cq_for_notification, void *tag_new); diff --git a/src/python/grpcio/precompiled.py b/src/python/grpcio/precompiled.py index 3cf0ded1e9..b6aa7fc90e 100644 --- a/src/python/grpcio/precompiled.py +++ b/src/python/grpcio/precompiled.py @@ -91,6 +91,9 @@ class BuildTaggedExt(setuptools.Command): def update_setup_arguments(setup_arguments): + if not USE_PRECOMPILED_BINARIES: + sys.stderr.write('not using precompiled extension') + return url = '{}/{}.so'.format(BINARIES_REPOSITORY, _tagged_ext_name('cygrpc')) target_path = os.path.join(PYTHON_STEM, 'grpc/_cython/cygrpc.so') try: |