third_party/protobuf/patches/0005-fix-include-js-generator.patch - Issue 2599323002: Revert "third_party/protobuf: Update to HEAD (f52e188fe4)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/patches/0005-fix-include-js-generator.patch

Issue 2599323002: Revert "third_party/protobuf: Update to HEAD (f52e188fe4)" (Closed)

Patch Set: rebase Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch ('k') | third_party/protobuf/patches/0008-uninline_get_empty_string.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/patches/0005-fix-include-js-generator.patch

diff --git a/third_party/protobuf/patches/0005-fix-include-js-generator.patch b/third_party/protobuf/patches/0005-fix-include-js-generator.patch

new file mode 100644

index 0000000000000000000000000000000000000000..b6b66724b2c7a0dfdac3e7f0422a52babe230571

--- /dev/null

+++ b/third_party/protobuf/patches/0005-fix-include-js-generator.patch

@@ -0,0 +1,11 @@

+--- protobuf-3.0.0-beta-3/src/google/protobuf/compiler/js/js_generator.cc 2016-05-16 11:34:04.000000000 -0700

++++ /usr/local/google/home/xyzzyz/chromium/src/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc 2016-05-17 12:46:08.746078982 -0700

+@@ -28,7 +28,7 @@

+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+-#include "google/protobuf/compiler/js/js_generator.h"

++#include <google/protobuf/compiler/js/js_generator.h>

+ #include <assert.h>

+ #include <algorithm>