aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-01-31 07:08:20 +0100
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-01-31 07:08:20 +0100
commit78825caeeb61b048b32ee7076f61501b4dc01087 (patch)
tree7fc9d41abbc69dfb8ea54ae31b0ce2f36be72249 /src/python
parentbf192eff5632213772ea3351f552722741d68e99 (diff)
parent4fba286e4d013734aa3f1ddb7d0554e596b88a2c (diff)
Merge branch 'win32_subprocess' into make-ruby-installable
Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec src/python/grpcio/grpc_core_dependencies.py tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters
Diffstat (limited to 'src/python')
-rw-r--r--src/python/grpcio/grpc_core_dependencies.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index db06092368..6112f30bcc 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -208,6 +208,7 @@ CORE_SOURCE_FILES = [
'src/core/support/string_posix.c',
'src/core/support/string_win32.c',
'src/core/support/subprocess_posix.c',
+ 'src/core/support/subprocess_windows.c',
'src/core/support/sync.c',
'src/core/support/sync_posix.c',
'src/core/support/sync_win32.c',