summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content__browser__browser_main_loop.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2012-02-09 12:53:00 +0000
committerRene Ladan <rene@FreeBSD.org>2012-02-09 12:53:00 +0000
commita71930e2d98159f8096fd848dbc2f91a11bf2ed5 (patch)
tree13b26094f9b010645218f8e27cec640890893aca /www/chromium/files/patch-content__browser__browser_main_loop.cc
parentDocument new Chromium < 17.0.963.46 vulnerabilities. (diff)
Update to 17.0.963.46
Obtained from: Chromium Chruetertee development repository Security: http://www.vuxml.org/freebsd/fe1976c2-5317-11e1-9e99-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-content__browser__browser_main_loop.cc')
-rw-r--r--www/chromium/files/patch-content__browser__browser_main_loop.cc29
1 files changed, 29 insertions, 0 deletions
diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc
new file mode 100644
index 000000000000..90ba548041d4
--- /dev/null
+++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc
@@ -0,0 +1,29 @@
+--- content/browser/browser_main_loop.cc.orig 2012-01-30 22:18:23.000000000 +0200
++++ content/browser/browser_main_loop.cc 2012-01-30 22:19:06.000000000 +0200
+@@ -39,7 +39,7 @@
+ #include "net/base/winsock_init.h"
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <glib-object.h>
+ #endif
+
+@@ -89,7 +89,7 @@
+ }
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ static void GLibLogHandler(const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message,
+@@ -518,7 +518,7 @@
+ // are no #else branches on any #ifs.
+ // TODO(stevenjb): Move platform specific code into platform specific Parts
+ // (Need to add InitializeToolkit stage to BrowserParts).
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Glib type system initialization. Needed at least for gconf,
+ // used in net/proxy/proxy_config_service_linux.cc. Most likely
+ // this is superfluous as gtk_init() ought to do this. It's