1 files changed, 48 insertions, 0 deletions
diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
new file mode 100644
index 000000000000..3f7401092341
--- /dev/null
+++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
@@ -0,0 +1,48 @@
+--- ppapi/proxy/file_io_resource.cc.orig	2016-05-11 19:02:25 UTC
++++ ppapi/proxy/file_io_resource.cc
+@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of
+ 
+   if (check_quota_) {
+     int64_t increase = 0;
+-    uint64_t max_offset = 0;
++    uint64_t _max_offset = 0;
++    // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD
++    // which also defines max_offset
+     bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0;
+     if (append) {
+       increase = bytes_to_write;
+     } else {
+-      uint64_t max_offset = offset + bytes_to_write;
+-      if (max_offset >
++      uint64_t _max_offset = offset + bytes_to_write;
++      if (_max_offset >
+           static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
+         return PP_ERROR_FAILED;  // amount calculation would overflow.
+       }
+-      increase = static_cast<int64_t>(max_offset) - max_written_offset_;
++      increase = static_cast<int64_t>(_max_offset) - max_written_offset_;
+     }
+ 
+     if (increase > 0) {
+@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t of
+       if (append)
+         append_mode_write_amount_ += bytes_to_write;
+       else
+-        max_written_offset_ = max_offset;
++        max_written_offset_ = _max_offset;
+     }
+   }
+   return WriteValidated(offset, buffer, bytes_to_write, callback);
+@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuota
+   } else {
+     DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);
+ 
+-    int64_t max_offset = offset + bytes_to_write;
+-    if (max_written_offset_ < max_offset)
+-      max_written_offset_ = max_offset;
++    int64_t _max_offset = offset + bytes_to_write;
++    if (max_written_offset_ < _max_offset)
++      max_written_offset_ = _max_offset;
+   }
+ 
+   if (callback->is_blocking()) {