From 26694857992b9925dc91f283383b89ad8af85dd4 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Tue, 5 Nov 2013 15:54:30 +0900
Subject: [PATCH] Bug 892856 - Protobuf fails to build in VS 2013. r=mmc

---
 toolkit/components/protobuf/README.txt              |  5 +++++
 .../protobuf/io/zero_copy_stream_impl_lite.cc       |  2 ++
 toolkit/components/protobuf/r512.patch              | 13 +++++++++++++
 toolkit/components/protobuf/update.sh               |  2 ++
 4 files changed, 22 insertions(+)
 create mode 100644 toolkit/components/protobuf/r512.patch
 create mode 100644 toolkit/components/protobuf/update.sh

diff --git a/toolkit/components/protobuf/README.txt b/toolkit/components/protobuf/README.txt
index 3312b0360c2..ef2f916ef0c 100644
--- a/toolkit/components/protobuf/README.txt
+++ b/toolkit/components/protobuf/README.txt
@@ -9,3 +9,8 @@ available at http://code.google.com/p/protobuf.
 This import includes only files in protobuf-lite, a lighter-weight library that
 does not support reflection or descriptors. Manual changes include removing all
 tests, testdata, config.h, and all files not used in protobuf-lite.
+
+Applied Patches
+===============
+r512.patch:
+  Support VS2013 (from revision r512)
diff --git a/toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc b/toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
index e80125109fc..a7de4a6d94a 100644
--- a/toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
+++ b/toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
@@ -36,6 +36,8 @@
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/stubs/stl_util-inl.h>
 
+#include <algorithm>
+
 namespace google {
 namespace protobuf {
 namespace io {
diff --git a/toolkit/components/protobuf/r512.patch b/toolkit/components/protobuf/r512.patch
new file mode 100644
index 00000000000..235db7017d5
--- /dev/null
+++ b/toolkit/components/protobuf/r512.patch
@@ -0,0 +1,13 @@
+Index: src/google/protobuf/io/zero_copy_stream_impl_lite.cc
+===================================================================
+--- src/google/protobuf/io/zero_copy_stream_impl_lite.cc	(revision 511)
++++ src/google/protobuf/io/zero_copy_stream_impl_lite.cc	(revision 512)
+@@ -36,6 +36,8 @@
+ #include <google/protobuf/stubs/common.h>
+ #include <google/protobuf/stubs/stl_util.h>
+ 
++#include <algorithm>
++
+ namespace google {
+ namespace protobuf {
+ namespace io {
diff --git a/toolkit/components/protobuf/update.sh b/toolkit/components/protobuf/update.sh
new file mode 100644
index 00000000000..3472a76fe1e
--- /dev/null
+++ b/toolkit/components/protobuf/update.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+patch -p1 < r512.patch