summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorrobert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 19:50:21 +0000
committerrobert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 19:50:21 +0000
commitc92f4ed1c339ad9a413a6945e5e6c71f397187a1 (patch)
tree0c82d9a609adb5e1df35d56ccb596cfea13039d4 /content
parent0f41c011f5323674c1619f78c05fd63529f1c760 (diff)
downloadchromium_src-c92f4ed1c339ad9a413a6945e5e6c71f397187a1.zip
chromium_src-c92f4ed1c339ad9a413a6945e5e6c71f397187a1.tar.gz
chromium_src-c92f4ed1c339ad9a413a6945e5e6c71f397187a1.tar.bz2
OpenBSD patches for chrome/content, split from CR #8275005
about_flags.cc: define kOsLinux on OpenBSD too for flags chrome_content_browser_client.cc: Replace OS_LINUX with TOOLKIT_USES_GTK so that Gtk+ platforms can share the code. component_updater_configurator.cc: OpenBSD defs. for the updater. chrome_browser.gypi: The dl library is linux only here. pepper_message_filter.cc: This asserts fails on OpenBSD so let's disable it for now so that the porting effort can move ahead and this issue can be investigated later. BUG= TEST= Review URL: http://codereview.chromium.org/8344001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/pepper_message_filter.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc
index 103af33..3cc90ce 100644
--- a/content/browser/renderer_host/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper_message_filter.cc
@@ -130,10 +130,13 @@ bool NetAddressToAddressList(const PP_Flash_NetAddress& net_addr,
} // namespace
+// This assert fails on OpenBSD for an unknown reason at the moment.
+#if !defined(OS_OPENBSD)
// Make sure the storage in |PP_Flash_NetAddress| is big enough. (Do it here
// since the data is opaque elsewhere.)
COMPILE_ASSERT(sizeof(reinterpret_cast<PP_Flash_NetAddress*>(0)->data) >=
sizeof(sockaddr_storage), PP_Flash_NetAddress_data_too_small);
+#endif
const PP_Flash_NetAddress kInvalidNetAddress = { 0 };