diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-12-06 22:29:12 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-12-06 22:29:12 -0800 |
| commit | 6043006af142fd2e10372ce5ef74f56b3064ce43 (patch) | |
| tree | 35b85d640b0e78e227a9f09f48ce06725b6aa7c1 /config.m4 | |
| parent | 67454d71e833a7704d61e673ad32e71dd31c868a (diff) | |
| parent | 84d78acfa41a1263ba75b46dd4e857e02ea2cb96 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'config.m4')
| -rw-r--r-- | config.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -53,7 +53,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/support/env_linux.cc \ src/core/lib/support/env_posix.cc \ src/core/lib/support/env_windows.cc \ - src/core/lib/support/histogram.cc \ + src/core/lib/support/fork.cc \ src/core/lib/support/host_port.cc \ src/core/lib/support/log.cc \ src/core/lib/support/log_android.cc \ @@ -62,7 +62,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/support/log_windows.cc \ src/core/lib/support/mpscq.cc \ src/core/lib/support/murmur_hash.cc \ - src/core/lib/support/stack_lockfree.cc \ src/core/lib/support/string.cc \ src/core/lib/support/string_posix.cc \ src/core/lib/support/string_util_windows.cc \ @@ -106,7 +105,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/http/httpcli.cc \ src/core/lib/http/parser.cc \ src/core/lib/iomgr/call_combiner.cc \ - src/core/lib/iomgr/closure.cc \ src/core/lib/iomgr/combiner.cc \ src/core/lib/iomgr/endpoint.cc \ src/core/lib/iomgr/endpoint_pair_posix.cc \ @@ -121,6 +119,8 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/ev_windows.cc \ src/core/lib/iomgr/exec_ctx.cc \ src/core/lib/iomgr/executor.cc \ + src/core/lib/iomgr/fork_posix.cc \ + src/core/lib/iomgr/fork_windows.cc \ src/core/lib/iomgr/gethostname_fallback.cc \ src/core/lib/iomgr/gethostname_host_name_max.cc \ src/core/lib/iomgr/gethostname_sysconf.cc \ |