Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-12 06:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 892856 - Protobuf fails to build in VS 2013. r=mmc

Browse Source
This commit is contained in:
Makoto Kato 2013-11-05 15:54:30 +09:00
parent 79fa492f2f
commit e8ae36d2ca
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolkit/components/protobuf/README.txt
View File

@ -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)

2
toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
View File

@ -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 {

13
toolkit/components/protobuf/r512.patch Normal file
View File

@ -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 {

2
toolkit/components/protobuf/update.sh Normal file
View File

@ -0,0 +1,2 @@
#!/bin/sh
patch -p1 < r512.patch