diff options
| author | shenhan@google.com <shenhan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 01:54:46 +0000 |
|---|---|---|
| committer | shenhan@google.com <shenhan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 01:54:46 +0000 |
| commit | 3fcbd4b4db3bb67e5e3d10944335c3a91f22723e (patch) | |
| tree | 3e35507ef2b232faf4f672f1a5f450d4c8b151ca /ipc | |
| parent | 34d4ebbfd10b704f4f9be87a74e2e072c4dec081 (diff) | |
| download | chromium_src-3fcbd4b4db3bb67e5e3d10944335c3a91f22723e.zip chromium_src-3fcbd4b4db3bb67e5e3d10944335c3a91f22723e.tar.gz chromium_src-3fcbd4b4db3bb67e5e3d10944335c3a91f22723e.tar.bz2 | |
Fixing gcc 4.7 building problems.
a) - gcc-4.7 improved the implicit headers that it includes. with
<4.7, the gthr-default.h file always pulls in unistd.h. with >=4.7,
they avoided that include when possible. so code that isn't including
unistd.h itself but needs it now breaks.
b) - narrowing conversion in initiliazation list now raises an
'ill-formed conversion' warning, which causes error when -Werror is
given.
[THIS PART IS NOW REVERTED IN THE PATCH} c) - included patches from pastebin - http://pastebin.com/raw.php?i=p3UKs7Cg
Note - this may not be fixing all the gcc 4.7 build problems for all
parts, but rather than submitting one big-fix-for-all CL, we'd better
do it incrementally (given that all the modification is reasonable and
minor) so that at least some parts get a successful gcc 4.7 build.
BUG=None
TEST=Built successfully using GCC-4.7 under chromium chroot
Review URL: https://chromiumcodereview.appspot.com/10451068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140470 0039d316-1c4b-4281-b951-d872f2087c98
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 |