From 26c78038a5b82d182652f82fb46160897aadf958 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 28 Sep 2017 14:34:43 -0700 Subject: [PATCH] Trying ken's fix for windows python --- BUILD | 2 +- CMakeLists.txt | 12 ++++++------ Makefile | 12 ++++++------ binding.gyp | 2 +- build.yaml | 2 +- config.m4 | 2 +- config.w32 | 2 +- gRPC-Core.podspec | 2 +- grpc.gemspec | 2 +- grpc.gyp | 8 ++++---- package.xml | 2 +- ...ocket_utils_windows.c => socket_utils_windows.cc} | 0 src/python/grpcio/grpc_core_dependencies.py | 2 +- tools/doxygen/Doxyfile.core.internal | 2 +- tools/run_tests/generated/sources_and_headers.json | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) rename src/core/lib/iomgr/{socket_utils_windows.c => socket_utils_windows.cc} (100%) diff --git a/BUILD b/BUILD index cfbeb392cb5..cc48ed4a5d6 100644 --- a/BUILD +++ b/BUILD @@ -625,7 +625,7 @@ grpc_cc_library( "src/core/lib/iomgr/socket_utils_linux.cc", "src/core/lib/iomgr/socket_utils_posix.cc", "src/core/lib/iomgr/socket_utils_uv.cc", - "src/core/lib/iomgr/socket_utils_windows.c", + "src/core/lib/iomgr/socket_utils_windows.cc", "src/core/lib/iomgr/socket_windows.cc", "src/core/lib/iomgr/tcp_client_posix.cc", "src/core/lib/iomgr/tcp_client_uv.cc", diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a0ff52b7a3..e3a1da06656 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1014,7 +1014,7 @@ add_library(grpc src/core/lib/iomgr/socket_utils_linux.cc src/core/lib/iomgr/socket_utils_posix.cc src/core/lib/iomgr/socket_utils_uv.cc - src/core/lib/iomgr/socket_utils_windows.c + src/core/lib/iomgr/socket_utils_windows.cc src/core/lib/iomgr/socket_windows.cc src/core/lib/iomgr/tcp_client_posix.cc src/core/lib/iomgr/tcp_client_uv.cc @@ -1363,7 +1363,7 @@ add_library(grpc_cronet src/core/lib/iomgr/socket_utils_linux.cc src/core/lib/iomgr/socket_utils_posix.cc src/core/lib/iomgr/socket_utils_uv.cc - src/core/lib/iomgr/socket_utils_windows.c + src/core/lib/iomgr/socket_utils_windows.cc src/core/lib/iomgr/socket_windows.cc src/core/lib/iomgr/tcp_client_posix.cc src/core/lib/iomgr/tcp_client_uv.cc @@ -1680,7 +1680,7 @@ add_library(grpc_test_util src/core/lib/iomgr/socket_utils_linux.cc src/core/lib/iomgr/socket_utils_posix.cc src/core/lib/iomgr/socket_utils_uv.cc - src/core/lib/iomgr/socket_utils_windows.c + src/core/lib/iomgr/socket_utils_windows.cc src/core/lib/iomgr/socket_windows.cc src/core/lib/iomgr/tcp_client_posix.cc src/core/lib/iomgr/tcp_client_uv.cc @@ -1941,7 +1941,7 @@ add_library(grpc_test_util_unsecure src/core/lib/iomgr/socket_utils_linux.cc src/core/lib/iomgr/socket_utils_posix.cc src/core/lib/iomgr/socket_utils_uv.cc - src/core/lib/iomgr/socket_utils_windows.c + src/core/lib/iomgr/socket_utils_windows.cc src/core/lib/iomgr/socket_windows.cc src/core/lib/iomgr/tcp_client_posix.cc src/core/lib/iomgr/tcp_client_uv.cc @@ -2188,7 +2188,7 @@ add_library(grpc_unsecure src/core/lib/iomgr/socket_utils_linux.cc src/core/lib/iomgr/socket_utils_posix.cc src/core/lib/iomgr/socket_utils_uv.cc - src/core/lib/iomgr/socket_utils_windows.c + src/core/lib/iomgr/socket_utils_windows.cc src/core/lib/iomgr/socket_windows.cc src/core/lib/iomgr/tcp_client_posix.cc src/core/lib/iomgr/tcp_client_uv.cc @@ -2943,7 +2943,7 @@ add_library(grpc++_cronet src/core/lib/iomgr/socket_utils_linux.cc src/core/lib/iomgr/socket_utils_posix.cc src/core/lib/iomgr/socket_utils_uv.cc - src/core/lib/iomgr/socket_utils_windows.c + src/core/lib/iomgr/socket_utils_windows.cc src/core/lib/iomgr/socket_windows.cc src/core/lib/iomgr/tcp_client_posix.cc src/core/lib/iomgr/tcp_client_uv.cc diff --git a/Makefile b/Makefile index 06a91e61289..9a871b77020 100644 --- a/Makefile +++ b/Makefile @@ -3005,7 +3005,7 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_uv.cc \ - src/core/lib/iomgr/socket_utils_windows.c \ + src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/tcp_client_posix.cc \ src/core/lib/iomgr/tcp_client_uv.cc \ @@ -3354,7 +3354,7 @@ LIBGRPC_CRONET_SRC = \ src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_uv.cc \ - src/core/lib/iomgr/socket_utils_windows.c \ + src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/tcp_client_posix.cc \ src/core/lib/iomgr/tcp_client_uv.cc \ @@ -3670,7 +3670,7 @@ LIBGRPC_TEST_UTIL_SRC = \ src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_uv.cc \ - src/core/lib/iomgr/socket_utils_windows.c \ + src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/tcp_client_posix.cc \ src/core/lib/iomgr/tcp_client_uv.cc \ @@ -3922,7 +3922,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \ src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_uv.cc \ - src/core/lib/iomgr/socket_utils_windows.c \ + src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/tcp_client_posix.cc \ src/core/lib/iomgr/tcp_client_uv.cc \ @@ -4147,7 +4147,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_uv.cc \ - src/core/lib/iomgr/socket_utils_windows.c \ + src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/tcp_client_posix.cc \ src/core/lib/iomgr/tcp_client_uv.cc \ @@ -4885,7 +4885,7 @@ LIBGRPC++_CRONET_SRC = \ src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_uv.cc \ - src/core/lib/iomgr/socket_utils_windows.c \ + src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/tcp_client_posix.cc \ src/core/lib/iomgr/tcp_client_uv.cc \ diff --git a/binding.gyp b/binding.gyp index 317b234f325..889b563e39c 100644 --- a/binding.gyp +++ b/binding.gyp @@ -716,7 +716,7 @@ 'src/core/lib/iomgr/socket_utils_linux.cc', 'src/core/lib/iomgr/socket_utils_posix.cc', 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.c', + 'src/core/lib/iomgr/socket_utils_windows.cc', 'src/core/lib/iomgr/socket_windows.cc', 'src/core/lib/iomgr/tcp_client_posix.cc', 'src/core/lib/iomgr/tcp_client_uv.cc', diff --git a/build.yaml b/build.yaml index 1d97dfaa8af..0f411f86453 100644 --- a/build.yaml +++ b/build.yaml @@ -244,7 +244,7 @@ filegroups: - src/core/lib/iomgr/socket_utils_linux.cc - src/core/lib/iomgr/socket_utils_posix.cc - src/core/lib/iomgr/socket_utils_uv.cc - - src/core/lib/iomgr/socket_utils_windows.c + - src/core/lib/iomgr/socket_utils_windows.cc - src/core/lib/iomgr/socket_windows.cc - src/core/lib/iomgr/tcp_client_posix.cc - src/core/lib/iomgr/tcp_client_uv.cc diff --git a/config.m4 b/config.m4 index 424c8600de5..5450bbeb1db 100644 --- a/config.m4 +++ b/config.m4 @@ -145,7 +145,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_uv.cc \ - src/core/lib/iomgr/socket_utils_windows.c \ + src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/tcp_client_posix.cc \ src/core/lib/iomgr/tcp_client_uv.cc \ diff --git a/config.w32 b/config.w32 index 579c6d50267..62b8dcdd767 100644 --- a/config.w32 +++ b/config.w32 @@ -122,7 +122,7 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\socket_utils_linux.cc " + "src\\core\\lib\\iomgr\\socket_utils_posix.cc " + "src\\core\\lib\\iomgr\\socket_utils_uv.cc " + - "src\\core\\lib\\iomgr\\socket_utils_windows.c " + + "src\\core\\lib\\iomgr\\socket_utils_windows.cc " + "src\\core\\lib\\iomgr\\socket_windows.cc " + "src\\core\\lib\\iomgr\\tcp_client_posix.cc " + "src\\core\\lib\\iomgr\\tcp_client_uv.cc " + diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index a9df0a57a47..e831058ee16 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -530,7 +530,7 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/socket_utils_linux.cc', 'src/core/lib/iomgr/socket_utils_posix.cc', 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.c', + 'src/core/lib/iomgr/socket_utils_windows.cc', 'src/core/lib/iomgr/socket_windows.cc', 'src/core/lib/iomgr/tcp_client_posix.cc', 'src/core/lib/iomgr/tcp_client_uv.cc', diff --git a/grpc.gemspec b/grpc.gemspec index 1fda0a64c8d..98bdbe10e12 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -467,7 +467,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/socket_utils_linux.cc ) s.files += %w( src/core/lib/iomgr/socket_utils_posix.cc ) s.files += %w( src/core/lib/iomgr/socket_utils_uv.cc ) - s.files += %w( src/core/lib/iomgr/socket_utils_windows.c ) + s.files += %w( src/core/lib/iomgr/socket_utils_windows.cc ) s.files += %w( src/core/lib/iomgr/socket_windows.cc ) s.files += %w( src/core/lib/iomgr/tcp_client_posix.cc ) s.files += %w( src/core/lib/iomgr/tcp_client_uv.cc ) diff --git a/grpc.gyp b/grpc.gyp index 8c8a25beb77..55853a65c96 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -282,7 +282,7 @@ 'src/core/lib/iomgr/socket_utils_linux.cc', 'src/core/lib/iomgr/socket_utils_posix.cc', 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.c', + 'src/core/lib/iomgr/socket_utils_windows.cc', 'src/core/lib/iomgr/socket_windows.cc', 'src/core/lib/iomgr/tcp_client_posix.cc', 'src/core/lib/iomgr/tcp_client_uv.cc', @@ -581,7 +581,7 @@ 'src/core/lib/iomgr/socket_utils_linux.cc', 'src/core/lib/iomgr/socket_utils_posix.cc', 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.c', + 'src/core/lib/iomgr/socket_utils_windows.cc', 'src/core/lib/iomgr/socket_windows.cc', 'src/core/lib/iomgr/tcp_client_posix.cc', 'src/core/lib/iomgr/tcp_client_uv.cc', @@ -785,7 +785,7 @@ 'src/core/lib/iomgr/socket_utils_linux.cc', 'src/core/lib/iomgr/socket_utils_posix.cc', 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.c', + 'src/core/lib/iomgr/socket_utils_windows.cc', 'src/core/lib/iomgr/socket_windows.cc', 'src/core/lib/iomgr/tcp_client_posix.cc', 'src/core/lib/iomgr/tcp_client_uv.cc', @@ -974,7 +974,7 @@ 'src/core/lib/iomgr/socket_utils_linux.cc', 'src/core/lib/iomgr/socket_utils_posix.cc', 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.c', + 'src/core/lib/iomgr/socket_utils_windows.cc', 'src/core/lib/iomgr/socket_windows.cc', 'src/core/lib/iomgr/tcp_client_posix.cc', 'src/core/lib/iomgr/tcp_client_uv.cc', diff --git a/package.xml b/package.xml index 99bcc7abf0e..0656c457d23 100644 --- a/package.xml +++ b/package.xml @@ -479,7 +479,7 @@ - + diff --git a/src/core/lib/iomgr/socket_utils_windows.c b/src/core/lib/iomgr/socket_utils_windows.cc similarity index 100% rename from src/core/lib/iomgr/socket_utils_windows.c rename to src/core/lib/iomgr/socket_utils_windows.cc diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 8fece7e7652..2955d16be68 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -121,7 +121,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/socket_utils_linux.cc', 'src/core/lib/iomgr/socket_utils_posix.cc', 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.c', + 'src/core/lib/iomgr/socket_utils_windows.cc', 'src/core/lib/iomgr/socket_windows.cc', 'src/core/lib/iomgr/tcp_client_posix.cc', 'src/core/lib/iomgr/tcp_client_uv.cc', diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index d056e0157b4..d4c645e728a 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1180,7 +1180,7 @@ src/core/lib/iomgr/socket_utils_linux.cc \ src/core/lib/iomgr/socket_utils_posix.cc \ src/core/lib/iomgr/socket_utils_posix.h \ src/core/lib/iomgr/socket_utils_uv.cc \ -src/core/lib/iomgr/socket_utils_windows.c \ +src/core/lib/iomgr/socket_utils_windows.cc \ src/core/lib/iomgr/socket_windows.cc \ src/core/lib/iomgr/socket_windows.h \ src/core/lib/iomgr/sys_epoll_wrapper.h \ diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index dd962b91d4e..b23c5d7bc91 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -8056,7 +8056,7 @@ "src/core/lib/iomgr/socket_utils_linux.cc", "src/core/lib/iomgr/socket_utils_posix.cc", "src/core/lib/iomgr/socket_utils_uv.cc", - "src/core/lib/iomgr/socket_utils_windows.c", + "src/core/lib/iomgr/socket_utils_windows.cc", "src/core/lib/iomgr/socket_windows.cc", "src/core/lib/iomgr/tcp_client_posix.cc", "src/core/lib/iomgr/tcp_client_uv.cc",