diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-24 09:01:14 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-24 09:01:14 -0800 |
| commit | ee1f1f347de8c9a74d8b2cf01840a44fbed83996 (patch) | |
| tree | a0ee2bf2e305b40b95d4d13b525442de68ac8155 /test/core | |
| parent | c605c62b30ca15c83a7c4e98386062c62de0d36d (diff) | |
| parent | 9114a142c9211e0f3401166c0b753349573caf14 (diff) | |
Merge branch 'hide-the-worker' into hide-the-pollset
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/census/mlog_test.c (renamed from test/core/census/log_test.c) | 2 | ||||
| -rw-r--r-- | test/core/util/port_windows.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/census/log_test.c b/test/core/census/mlog_test.c index b68ca11504..5b6c5946ab 100644 --- a/test/core/census/log_test.c +++ b/test/core/census/mlog_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/census/log.h" +#include "src/core/census/mlog.h" #include <grpc/support/cpu.h> #include <grpc/support/log.h> #include <grpc/support/port_platform.h> diff --git a/test/core/util/port_windows.c b/test/core/util/port_windows.c index 85d7c0ce07..b5bd0168ad 100644 --- a/test/core/util/port_windows.c +++ b/test/core/util/port_windows.c @@ -180,7 +180,7 @@ static int pick_port_using_server(char *server) { &pr); gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (pr.port == -1) { - grpc_pollset_worker worker; + grpc_pollset_worker *worker = NULL; grpc_pollset_work(&exec_ctx, &pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); |