summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui__base__l10n__l10n_util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui__base__l10n__l10n_util.cc')
-rw-r--r--www/chromium/files/patch-ui__base__l10n__l10n_util.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-ui__base__l10n__l10n_util.cc b/www/chromium/files/patch-ui__base__l10n__l10n_util.cc
index e84c058f0e83..e3268b81d750 100644
--- a/www/chromium/files/patch-ui__base__l10n__l10n_util.cc
+++ b/www/chromium/files/patch-ui__base__l10n__l10n_util.cc
@@ -1,20 +1,20 @@
---- ui/base/l10n/l10n_util.cc.orig 2012-06-05 23:55:13.000000000 +0300
-+++ ui/base/l10n/l10n_util.cc 2012-06-06 00:00:11.000000000 +0300
+--- ui/base/l10n/l10n_util.cc.orig 2012-11-28 04:02:47.000000000 +0200
++++ ui/base/l10n/l10n_util.cc 2012-12-04 22:11:25.000000000 +0200
@@ -33,7 +33,7 @@
#include "base/android/locale_utils.h"
#endif
-#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
++#if defined(OS_LINUX) || defined(OS_BSD)
#include <glib.h>
#endif
-@@ -417,7 +417,7 @@
+@@ -419,7 +419,7 @@
if (!pref_locale.empty())
candidates.push_back(pref_locale);
-#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
++#elif defined(OS_LINUX) || defined(OS_BSD)
// If we're on a different Linux system, we have glib.
// GLib implements correct environment variable parsing with