Reverting pb.c files for now. Also fixing few more build errors

8 years ago · 15ce142d65
parent 1c1e6beb20
commit 15ce142d65
21 changed files with 80 additions and 61 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1178,7 +1178,7 @@ add_library(grpc
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
  src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc
+  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
  third_party/nanopb/pb_common.c
  third_party/nanopb/pb_decode.c
  third_party/nanopb/pb_encode.c
@ -1195,8 +1195,8 @@ add_library(grpc
  src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc
  src/core/ext/census/base_resources.cc
  src/core/ext/census/context.cc
-  src/core/ext/census/gen/census.pb.cc
-  src/core/ext/census/gen/trace_context.pb.cc
+  src/core/ext/census/gen/census.pb.c
+  src/core/ext/census/gen/trace_context.pb.c
  src/core/ext/census/grpc_context.cc
  src/core/ext/census/grpc_filter.cc
  src/core/ext/census/grpc_plugin.cc
@ -2329,7 +2329,7 @@ add_library(grpc_unsecure
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
  src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc
+  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
  third_party/nanopb/pb_common.c
  third_party/nanopb/pb_decode.c
  third_party/nanopb/pb_encode.c
@ -2337,8 +2337,8 @@ add_library(grpc_unsecure
  src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
  src/core/ext/census/base_resources.cc
  src/core/ext/census/context.cc
-  src/core/ext/census/gen/census.pb.cc
-  src/core/ext/census/gen/trace_context.pb.cc
+  src/core/ext/census/gen/census.pb.c
+  src/core/ext/census/gen/trace_context.pb.c
  src/core/ext/census/grpc_context.cc
  src/core/ext/census/grpc_filter.cc
  src/core/ext/census/grpc_plugin.cc
@ -3045,8 +3045,8 @@ add_library(grpc++_cronet
  src/core/ext/transport/chttp2/server/chttp2_server.cc
  src/core/ext/census/base_resources.cc
  src/core/ext/census/context.cc
-  src/core/ext/census/gen/census.pb.cc
-  src/core/ext/census/gen/trace_context.pb.cc
+  src/core/ext/census/gen/census.pb.c
+  src/core/ext/census/gen/trace_context.pb.c
  src/core/ext/census/grpc_context.cc
  src/core/ext/census/grpc_filter.cc
  src/core/ext/census/grpc_plugin.cc
--- a/16
+++ b/16
@ -3169,7 +3169,7 @@ LIBGRPC_SRC = \
    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc \
+    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -3186,8 +3186,8 @@ LIBGRPC_SRC = \
    src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc \
    src/core/ext/census/base_resources.cc \
    src/core/ext/census/context.cc \
-    src/core/ext/census/gen/census.pb.cc \
-    src/core/ext/census/gen/trace_context.pb.cc \
+    src/core/ext/census/gen/census.pb.c \
+    src/core/ext/census/gen/trace_context.pb.c \
    src/core/ext/census/grpc_context.cc \
    src/core/ext/census/grpc_filter.cc \
    src/core/ext/census/grpc_plugin.cc \
@ -4288,7 +4288,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc \
+    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -4296,8 +4296,8 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
    src/core/ext/census/base_resources.cc \
    src/core/ext/census/context.cc \
-    src/core/ext/census/gen/census.pb.cc \
-    src/core/ext/census/gen/trace_context.pb.cc \
+    src/core/ext/census/gen/census.pb.c \
+    src/core/ext/census/gen/trace_context.pb.c \
    src/core/ext/census/grpc_context.cc \
    src/core/ext/census/grpc_filter.cc \
    src/core/ext/census/grpc_plugin.cc \
@ -4987,8 +4987,8 @@ LIBGRPC++_CRONET_SRC = \
    src/core/ext/transport/chttp2/server/chttp2_server.cc \
    src/core/ext/census/base_resources.cc \
    src/core/ext/census/context.cc \
-    src/core/ext/census/gen/census.pb.cc \
-    src/core/ext/census/gen/trace_context.pb.cc \
+    src/core/ext/census/gen/census.pb.c \
+    src/core/ext/census/gen/trace_context.pb.c \
    src/core/ext/census/grpc_context.cc \
    src/core/ext/census/grpc_filter.cc \
    src/core/ext/census/grpc_plugin.cc \
--- a/binding.gyp
+++ b/binding.gyp
@ -880,7 +880,7 @@
        'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
-        'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc',
+        'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
        'third_party/nanopb/pb_common.c',
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
@ -897,8 +897,8 @@
        'src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc',
        'src/core/ext/census/base_resources.cc',
        'src/core/ext/census/context.cc',
-        'src/core/ext/census/gen/census.pb.cc',
-        'src/core/ext/census/gen/trace_context.pb.cc',
+        'src/core/ext/census/gen/census.pb.c',
+        'src/core/ext/census/gen/trace_context.pb.c',
        'src/core/ext/census/grpc_context.cc',
        'src/core/ext/census/grpc_filter.cc',
        'src/core/ext/census/grpc_plugin.cc',
--- a/build.yaml
+++ b/build.yaml
@ -41,8 +41,8 @@ filegroups:
  src:
  - src/core/ext/census/base_resources.cc
  - src/core/ext/census/context.cc
-  - src/core/ext/census/gen/census.pb.cc
-  - src/core/ext/census/gen/trace_context.pb.cc
+  - src/core/ext/census/gen/census.pb.c
+  - src/core/ext/census/gen/trace_context.pb.c
  - src/core/ext/census/grpc_context.cc
  - src/core/ext/census/grpc_filter.cc
  - src/core/ext/census/grpc_plugin.cc
@ -550,7 +550,7 @@ filegroups:
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
  plugin: grpc_lb_policy_grpclb
  uses:
  - grpc_base
@ -571,7 +571,7 @@ filegroups:
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
  plugin: grpc_lb_policy_grpclb
  uses:
  - grpc_base
--- a/config.m4
+++ b/config.m4
@ -309,7 +309,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc \
+    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -326,8 +326,8 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc \
    src/core/ext/census/base_resources.cc \
    src/core/ext/census/context.cc \
-    src/core/ext/census/gen/census.pb.cc \
-    src/core/ext/census/gen/trace_context.pb.cc \
+    src/core/ext/census/gen/census.pb.c \
+    src/core/ext/census/gen/trace_context.pb.c \
    src/core/ext/census/grpc_context.cc \
    src/core/ext/census/grpc_filter.cc \
    src/core/ext/census/grpc_plugin.cc \
--- a/config.w32
+++ b/config.w32
@ -286,7 +286,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb_channel_secure.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb_client_stats.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\load_balancer_api.cc " +
-    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\load_balancer.pb.cc " +
+    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\load_balancer.pb.c " +
    "third_party\\nanopb\\pb_common.c " +
    "third_party\\nanopb\\pb_decode.c " +
    "third_party\\nanopb\\pb_encode.c " +
@ -303,8 +303,8 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\load_reporting\\server_load_reporting_plugin.cc " +
    "src\\core\\ext\\census\\base_resources.cc " +
    "src\\core\\ext\\census\\context.cc " +
-    "src\\core\\ext\\census\\gen\\census.pb.cc " +
-    "src\\core\\ext\\census\\gen\\trace_context.pb.cc " +
+    "src\\core\\ext\\census\\gen\\census.pb.c " +
+    "src\\core\\ext\\census\\gen\\trace_context.pb.c " +
    "src\\core\\ext\\census\\grpc_context.cc " +
    "src\\core\\ext\\census\\grpc_filter.cc " +
    "src\\core\\ext\\census\\grpc_plugin.cc " +
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -694,7 +694,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
-                      'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc',
+                      'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
                      'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
                      'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
                      'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
@ -708,8 +708,8 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc',
                      'src/core/ext/census/base_resources.cc',
                      'src/core/ext/census/context.cc',
-                      'src/core/ext/census/gen/census.pb.cc',
-                      'src/core/ext/census/gen/trace_context.pb.cc',
+                      'src/core/ext/census/gen/census.pb.c',
+                      'src/core/ext/census/gen/trace_context.pb.c',
                      'src/core/ext/census/grpc_context.cc',
                      'src/core/ext/census/grpc_filter.cc',
                      'src/core/ext/census/grpc_plugin.cc',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -631,7 +631,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc )
-  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc )
+  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c )
  s.files += %w( third_party/nanopb/pb_common.c )
  s.files += %w( third_party/nanopb/pb_decode.c )
  s.files += %w( third_party/nanopb/pb_encode.c )
@ -648,8 +648,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc )
  s.files += %w( src/core/ext/census/base_resources.cc )
  s.files += %w( src/core/ext/census/context.cc )
-  s.files += %w( src/core/ext/census/gen/census.pb.cc )
-  s.files += %w( src/core/ext/census/gen/trace_context.pb.cc )
+  s.files += %w( src/core/ext/census/gen/census.pb.c )
+  s.files += %w( src/core/ext/census/gen/trace_context.pb.c )
  s.files += %w( src/core/ext/census/grpc_context.cc )
  s.files += %w( src/core/ext/census/grpc_filter.cc )
  s.files += %w( src/core/ext/census/grpc_plugin.cc )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -446,7 +446,7 @@
        'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
-        'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc',
+        'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
        'third_party/nanopb/pb_common.c',
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
@ -463,8 +463,8 @@
        'src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc',
        'src/core/ext/census/base_resources.cc',
        'src/core/ext/census/context.cc',
-        'src/core/ext/census/gen/census.pb.cc',
-        'src/core/ext/census/gen/trace_context.pb.cc',
+        'src/core/ext/census/gen/census.pb.c',
+        'src/core/ext/census/gen/trace_context.pb.c',
        'src/core/ext/census/grpc_context.cc',
        'src/core/ext/census/grpc_filter.cc',
        'src/core/ext/census/grpc_plugin.cc',
@ -1115,7 +1115,7 @@
        'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
-        'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc',
+        'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
        'third_party/nanopb/pb_common.c',
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
@ -1123,8 +1123,8 @@
        'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
        'src/core/ext/census/base_resources.cc',
        'src/core/ext/census/context.cc',
-        'src/core/ext/census/gen/census.pb.cc',
-        'src/core/ext/census/gen/trace_context.pb.cc',
+        'src/core/ext/census/gen/census.pb.c',
+        'src/core/ext/census/gen/trace_context.pb.c',
        'src/core/ext/census/grpc_context.cc',
        'src/core/ext/census/grpc_filter.cc',
        'src/core/ext/census/grpc_plugin.cc',
--- a/package.xml
+++ b/package.xml
@ -643,7 +643,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_common.c" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_decode.c" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_encode.c" role="src" />
@ -660,8 +660,8 @@
    <file baseinstalldir="/" name="src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/census/base_resources.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/census/context.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/census/gen/census.pb.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/census/gen/trace_context.pb.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/census/gen/census.pb.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/census/gen/trace_context.pb.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/census/grpc_context.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/census/grpc_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/census/grpc_plugin.cc" role="src" />
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@ -2648,8 +2648,7 @@ void grpc_chttp2_config_default_keepalive_args(grpc_channel_args *args,
      } else if (0 ==
                 strcmp(args->args[i].key, GRPC_ARG_HTTP2_MAX_PING_STRIKES)) {
        g_default_max_ping_strikes = grpc_channel_arg_get_integer(
-            &args->args[i],
-            (grpc_integer_options){g_default_max_ping_strikes, 0, INT_MAX});
+            &args->args[i], {g_default_max_ping_strikes, 0, INT_MAX});
      } else if (0 == strcmp(args->args[i].key,
                             GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA)) {
        g_default_max_pings_without_data = grpc_channel_arg_get_integer(
--- a/src/core/lib/security/credentials/jwt/json_token.cc
+++ b/src/core/lib/security/credentials/jwt/json_token.cc
@ -30,9 +30,11 @@
 #include "src/core/lib/slice/b64.h"
 #include "src/core/lib/support/string.h"

+extern "C" {
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
+}

 /* --- Constants. --- */

--- a/src/core/lib/security/credentials/jwt/json_token.h
+++ b/src/core/lib/security/credentials/jwt/json_token.h
@ -19,6 +19,10 @@
 #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H
 #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <grpc/slice.h>
 #include <openssl/rsa.h>

@ -28,10 +32,6 @@

 #define GRPC_JWT_OAUTH2_AUDIENCE "https://www.googleapis.com/oauth2/v3/token"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* --- auth_json_key parsing. --- */

 typedef struct {
@ -78,4 +78,4 @@ void grpc_jwt_encode_and_sign_set_override(
 }
 #endif

-#endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H */
+#endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H */
--- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc
+++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc
@ -26,7 +26,10 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/useful.h>
+
+extern "C" {
 #include <openssl/pem.h>
+}

 #include "src/core/lib/http/httpcli.h"
 #include "src/core/lib/iomgr/polling_entity.h"
--- a/src/core/lib/support/string_util_windows.cc
+++ b/src/core/lib/support/string_util_windows.cc
@ -36,6 +36,7 @@
 #include <grpc/support/string_util.h>

 #include "src/core/lib/support/string.h"
+#include "src/core/lib/support/string_windows.h"

 #if defined UNICODE || defined _UNICODE
 LPTSTR
--- a/src/core/lib/surface/alarm.cc
+++ b/src/core/lib/surface/alarm.cc
@ -15,6 +15,10 @@
 * limitations under the License.
 *
 */
+#include <grpc/support/port_platform.h>
+
+#include <inttypes.h>
+
 #include "src/core/lib/surface/alarm_internal.h"

 #include <grpc/grpc.h>
--- a/src/core/tsi/ssl_transport_security.cc
+++ b/src/core/tsi/ssl_transport_security.cc
@ -39,12 +39,14 @@
 #include <grpc/support/thd.h>
 #include <grpc/support/useful.h>

+extern "C" {
 #include <openssl/bio.h>
 #include <openssl/crypto.h> /* For OPENSSL_free */
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+}

 #include "src/core/tsi/ssl_types.h"
 #include "src/core/tsi/transport_security.h"
--- a/src/core/tsi/ssl_types.h
+++ b/src/core/tsi/ssl_types.h
@ -19,6 +19,10 @@
 #ifndef GRPC_CORE_TSI_SSL_TYPES_H
 #define GRPC_CORE_TSI_SSL_TYPES_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* A collection of macros to cast between various integer types that are
 * used differently between BoringSSL and OpenSSL:
 * TSI_INT_AS_SIZE(x):  convert 'int x' to a length parameter for an OpenSSL
@ -37,4 +41,8 @@
 #define TSI_SIZE_AS_SIZE(x) ((int)(x))
 #endif

+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GRPC_CORE_TSI_SSL_TYPES_H */
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -285,7 +285,7 @@ CORE_SOURCE_FILES = [
  'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
  'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
  'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
-  'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc',
+  'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
  'third_party/nanopb/pb_common.c',
  'third_party/nanopb/pb_decode.c',
  'third_party/nanopb/pb_encode.c',
@ -302,8 +302,8 @@ CORE_SOURCE_FILES = [
  'src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc',
  'src/core/ext/census/base_resources.cc',
  'src/core/ext/census/context.cc',
-  'src/core/ext/census/gen/census.pb.cc',
-  'src/core/ext/census/gen/trace_context.pb.cc',
+  'src/core/ext/census/gen/census.pb.c',
+  'src/core/ext/census/gen/trace_context.pb.c',
  'src/core/ext/census/grpc_context.cc',
  'src/core/ext/census/grpc_filter.cc',
  'src/core/ext/census/grpc_plugin.cc',
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -878,9 +878,9 @@ src/core/ext/census/census_interface.h \
 src/core/ext/census/census_rpc_stats.h \
 src/core/ext/census/context.cc \
 src/core/ext/census/gen/README.md \
-src/core/ext/census/gen/census.pb.cc \
+src/core/ext/census/gen/census.pb.c \
 src/core/ext/census/gen/census.pb.h \
-src/core/ext/census/gen/trace_context.pb.cc \
+src/core/ext/census/gen/trace_context.pb.c \
 src/core/ext/census/gen/trace_context.pb.h \
 src/core/ext/census/grpc_context.cc \
 src/core/ext/census/grpc_filter.cc \
@ -930,7 +930,7 @@ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
 src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h \
 src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
 src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h \
-src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc \
+src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
 src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h \
 src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
 src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -7727,9 +7727,9 @@
      "src/core/ext/census/census_interface.h", 
      "src/core/ext/census/census_rpc_stats.h", 
      "src/core/ext/census/context.cc", 
-      "src/core/ext/census/gen/census.pb.cc", 
+      "src/core/ext/census/gen/census.pb.c", 
      "src/core/ext/census/gen/census.pb.h", 
-      "src/core/ext/census/gen/trace_context.pb.cc", 
+      "src/core/ext/census/gen/trace_context.pb.c", 
      "src/core/ext/census/gen/trace_context.pb.h", 
      "src/core/ext/census/grpc_context.cc", 
      "src/core/ext/census/grpc_filter.cc", 
@ -8579,7 +8579,7 @@
      "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h", 
      "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc", 
      "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h", 
-      "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc", 
+      "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c", 
      "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
    ], 
    "third_party": false, 
@ -8616,7 +8616,7 @@
      "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h", 
      "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc", 
      "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h", 
-      "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.cc", 
+      "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c", 
      "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
    ], 
    "third_party": false,