third_party/protobuf/src/google/protobuf/testing/zcgzip.cc - Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll).

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/src/google/protobuf/testing/zcgzip.cc

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 months 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/src/google/protobuf/testing/zcgunzip.cc ('k') | third_party/protobuf/src/google/protobuf/text_format.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/testing/zcgzip.cc

diff --git a/third_party/protobuf/src/google/protobuf/testing/zcgzip.cc b/third_party/protobuf/src/google/protobuf/testing/zcgzip.cc

index 992ddc6ed66b3cae568fa8267feb74b4a473ed48..9133275c8aa695879fc4c9f69db856cfdc18756e 100644

--- a/third_party/protobuf/src/google/protobuf/testing/zcgzip.cc

+++ b/third_party/protobuf/src/google/protobuf/testing/zcgzip.cc

@@ -1,6 +1,6 @@

// Protocol Buffers - Google's data interchange format

-// https://developers.google.com/protocol-buffers/

+// http://code.google.com/p/protobuf/

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

@@ -38,19 +38,12 @@

// Reads data on standard input and writes compressed gzip stream to standard

// output.

+#include "config.h"

#include <stdio.h>

#include <stdlib.h>

#include <fcntl.h>

-#ifdef _WIN32

-#ifndef STDIN_FILENO

-#define STDIN_FILENO 0

-#endif

-#ifndef STDOUT_FILENO

-#define STDOUT_FILENO 1

-#endif

#include <google/protobuf/io/gzip_stream.h>

#include <google/protobuf/io/zero_copy_stream_impl.h>