diff options
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_channel.h | 4 | ||||
| -rw-r--r-- | ipc/ipc_channel_posix.cc | 3 | ||||
| -rw-r--r-- | ipc/ipc_platform_file.cc | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h index 2aeca1f..14c375b 100644 --- a/ipc/ipc_channel.h +++ b/ipc/ipc_channel.h @@ -8,6 +8,10 @@ #include <string> +#if defined(OS_POSIX) +#include <sys/types.h> +#endif + #include "base/compiler_specific.h" #include "base/process.h" #include "ipc/ipc_channel_handle.h" diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 9d9b8d1..3e39534 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -11,6 +11,7 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> +#include <unistd.h> #if defined(OS_OPENBSD) #include <sys/uio.h> @@ -898,7 +899,7 @@ Channel::ChannelImpl::ReadState Channel::ChannelImpl::ReadData( struct msghdr msg = {0}; - struct iovec iov = {buffer, buffer_len}; + struct iovec iov = {buffer, static_cast<size_t>(buffer_len)}; msg.msg_iov = &iov; msg.msg_iovlen = 1; diff --git a/ipc/ipc_platform_file.cc b/ipc/ipc_platform_file.cc index b5ec7be..6aad89b 100644 --- a/ipc/ipc_platform_file.cc +++ b/ipc/ipc_platform_file.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "ipc/ipc_platform_file.h" -#if defined(OS_ANDROID) +#if defined(OS_POSIX) #include <unistd.h> #endif |