diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 08:29:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 08:29:05 -0700 |
| commit | 9d77ed5e2df5eabed41e0acac511d2f2edff3aad (patch) | |
| tree | 51355e20b28e7515cc90922e2e3f3e0399992f9a /src/core/iomgr/iomgr_posix.c | |
| parent | ef37d7cd4eee37689380e727a268fbb06f286fcb (diff) | |
| parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) | |
Merge github.com:grpc/grpc into accounting
Diffstat (limited to 'src/core/iomgr/iomgr_posix.c')
| -rw-r--r-- | src/core/iomgr/iomgr_posix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/iomgr_posix.c b/src/core/iomgr/iomgr_posix.c index fecb7b9760..2f7f34746b 100644 --- a/src/core/iomgr/iomgr_posix.c +++ b/src/core/iomgr/iomgr_posix.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,9 +35,9 @@ #ifdef GPR_POSIX_SOCKET -#include "src/core/iomgr/iomgr_posix.h" #include "src/core/debug/trace.h" #include "src/core/iomgr/fd_posix.h" +#include "src/core/iomgr/iomgr_posix.h" #include "src/core/iomgr/tcp_posix.h" void grpc_iomgr_platform_init(void) { |