summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base__strings__safe_sprintf.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base__strings__safe_sprintf.cc')
-rw-r--r--www/chromium/files/patch-base__strings__safe_sprintf.cc19
1 files changed, 19 insertions, 0 deletions
diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc
new file mode 100644
index 000000000000..023027f05962
--- /dev/null
+++ b/www/chromium/files/patch-base__strings__safe_sprintf.cc
@@ -0,0 +1,19 @@
+--- ./base/strings/safe_sprintf.cc.orig 2014-03-04 03:16:26.000000000 +0100
++++ ./base/strings/safe_sprintf.cc 2014-03-07 14:14:55.000000000 +0100
+@@ -107,11 +107,11 @@
+ : buffer_(buffer),
+ size_(size - 1), // Account for trailing NUL byte
+ count_(0) {
+-// The following assertion does not build on Mac and Android. This is because
+-// static_assert only works with compile-time constants, but mac uses
+-// libstdc++4.2 and android uses stlport, which both don't mark
+-// numeric_limits::max() as constexp.
+-#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
++// The following assertion does not build on Mac and Android and older FreeBSD.
++// This is because static_assert only works with compile-time constants, but
++// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both
++// don't mark numeric_limits::max() as constexp.
++#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054)
+ COMPILE_ASSERT(kSSizeMaxConst == \
+ static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
+ kSSizeMax_is_the_max_value_of_an_ssize_t);