зеркало из https://github.com/mozilla/gecko-dev.git
Bug 892856 - Protobuf fails to build in VS 2013. r=mmc
This commit is contained in:
Родитель
79fa492f2f
Коммит
e8ae36d2ca
|
@ -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)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
patch -p1 < r512.patch
|
Загрузка…
Ссылка в новой задаче