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

Bug 892856 - Fix protobuf to build with VS2013 v2. r=mmc

Browse Source
This commit is contained in:
Xavier Fung 2014-01-18 02:17:51 +09:00
parent 2663675f12
commit 9e737eb6f7
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,3 +14,6 @@ Applied Patches
===============
r512.patch:
Support VS2013 (from revision r512)
vs2013.patch
Additional changes to support VS2013 missed from revision r512.

1
toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
View File

@ -36,6 +36,7 @@
#ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
#define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
#include <algorithm>
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/message_lite.h>

21
toolkit/components/protobuf/vs2013.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h b/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
--- a/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
+++ b/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
@@ -31,16 +31,17 @@
// Author: kenton@google.com (Kenton Varda)
// wink@google.com (Wink Saville) (refactored from wire_format.h)
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
#define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
+#include <algorithm>
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/message_lite.h>
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/wire_format_lite.h>
#include <google/protobuf/generated_message_util.h>
#include <google/protobuf/io/coded_stream.h>