diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-11-24 17:06:37 -0800 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-11-24 17:06:37 -0800 |
commit | d6ddc49da3fc1babaa72f0c8e9713b55f9fed2fe (patch) | |
tree | 911c7029bb3eb23a61f7ccee6c3c9b6746462ad8 /test/core/util/reconnect_server.h | |
parent | 486ea3509e7dc272a6642c5b8e6cb9a68c61c6d7 (diff) | |
parent | 945836eade7d8f12f6eb84bc209da13ae7c89b38 (diff) |
Merge github.com:grpc/grpc into i-have-no-master
Diffstat (limited to 'test/core/util/reconnect_server.h')
-rw-r--r-- | test/core/util/reconnect_server.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/core/util/reconnect_server.h b/test/core/util/reconnect_server.h index 8a278e0c7a..e2e6a02461 100644 --- a/test/core/util/reconnect_server.h +++ b/test/core/util/reconnect_server.h @@ -36,7 +36,7 @@ #include <grpc/support/sync.h> #include <grpc/support/time.h> -#include "src/core/iomgr/tcp_server.h" +#include "test/core/util/test_tcp_server.h" #ifdef __cplusplus extern "C" { @@ -48,9 +48,7 @@ typedef struct timestamp_list { } timestamp_list; typedef struct reconnect_server { - grpc_tcp_server *tcp_server; - grpc_pollset pollset; - grpc_pollset *pollsets[1]; + test_tcp_server tcp_server; timestamp_list *head; timestamp_list *tail; char *peer; |