diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-05 00:30:40 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-05 00:30:40 +0200 |
| commit | 6415043781e0b73008b3db539f18354fe776241a (patch) | |
| tree | 78fc8db5eb33ac5cdea96b0a743a57c02e9b0109 /src/core/lib/iomgr/tcp_server_posix.c | |
| parent | 1bb17d31cd00d70048c51c99ed5a827ea10389e6 (diff) | |
| parent | 1b7c0a2c5cf27d7a77d9c3476fe6406a98ca3d76 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into gpr_malloc_is_all
Diffstat (limited to 'src/core/lib/iomgr/tcp_server_posix.c')
| -rw-r--r-- | src/core/lib/iomgr/tcp_server_posix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/tcp_server_posix.c b/src/core/lib/iomgr/tcp_server_posix.c index e9c7f4ef5c..aaeb384f6e 100644 --- a/src/core/lib/iomgr/tcp_server_posix.c +++ b/src/core/lib/iomgr/tcp_server_posix.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,7 +59,6 @@ #include <grpc/support/string_util.h> #include <grpc/support/sync.h> #include <grpc/support/time.h> -#include "src/core/lib/iomgr/pollset_posix.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils_posix.h" |