diff options
| author |  Vijay Pai <vpai@google.com> | 2016-10-18 12:15:08 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-10-18 12:15:08 -0700 |
| commit | 9fa9315d62c3163a93eeae2b3d3bb70231567b83 (patch) | |
| tree | 49968018548e4a294026a9f95b8ea5363efceb0e /gRPC-Core.podspec | |
| parent | 23c5b812687d0ebb86ed86d64416b232f8771e56 (diff) | |
| parent | 948f95b2ce4204f859c867207bd991d30ca17ee7 (diff) | |
Merge remote-tracking branch 'upstream/master' into fc_1dstream
Diffstat (limited to 'gRPC-Core.podspec')
| -rw-r--r-- | gRPC-Core.podspec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 6886bdfb5a..f9932122e9 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -304,10 +304,10 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/timer_heap.h', 'src/core/lib/iomgr/udp_server.h', 'src/core/lib/iomgr/unix_sockets_posix.h', + 'src/core/lib/iomgr/wakeup_fd_cv.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', 'src/core/lib/iomgr/workqueue.h', - 'src/core/lib/iomgr/workqueue_posix.h', 'src/core/lib/iomgr/workqueue_windows.h', 'src/core/lib/json/json.h', 'src/core/lib/json/json_common.h', @@ -470,11 +470,11 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/udp_server.c', 'src/core/lib/iomgr/unix_sockets_posix.c', 'src/core/lib/iomgr/unix_sockets_posix_noop.c', + 'src/core/lib/iomgr/wakeup_fd_cv.c', 'src/core/lib/iomgr/wakeup_fd_eventfd.c', 'src/core/lib/iomgr/wakeup_fd_nospecial.c', 'src/core/lib/iomgr/wakeup_fd_pipe.c', 'src/core/lib/iomgr/wakeup_fd_posix.c', - 'src/core/lib/iomgr/workqueue_posix.c', 'src/core/lib/iomgr/workqueue_windows.c', 'src/core/lib/json/json.c', 'src/core/lib/json/json_reader.c', @@ -677,10 +677,10 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/timer_heap.h', 'src/core/lib/iomgr/udp_server.h', 'src/core/lib/iomgr/unix_sockets_posix.h', + 'src/core/lib/iomgr/wakeup_fd_cv.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', 'src/core/lib/iomgr/workqueue.h', - 'src/core/lib/iomgr/workqueue_posix.h', 'src/core/lib/iomgr/workqueue_windows.h', 'src/core/lib/json/json.h', 'src/core/lib/json/json_common.h', |