diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-07-29 01:13:20 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-07-29 01:13:20 +0000 |
| commit | 80b1d62bfcea65c59e2160da71dad84b1bd19cef (patch) | |
| tree | 5423b830c53174fec83a7ea01ff0877e11c1ddb6 /src/google/protobuf/io/gzip_stream.cc | |
| parent | d2fd0638c309113ccae3731a58e30419f522269a (diff) | |
| download | protobuf-80b1d62bfcea65c59e2160da71dad84b1bd19cef.tar.gz protobuf-80b1d62bfcea65c59e2160da71dad84b1bd19cef.tar.bz2 protobuf-80b1d62bfcea65c59e2160da71dad84b1bd19cef.zip | |
Submit recent changes from internal branch, including "lite mode" for
C++ and Java. See CHANGES.txt for more details.
Diffstat (limited to 'src/google/protobuf/io/gzip_stream.cc')
| -rw-r--r-- | src/google/protobuf/io/gzip_stream.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/google/protobuf/io/gzip_stream.cc b/src/google/protobuf/io/gzip_stream.cc index d8d0e70d..243b3e32 100644 --- a/src/google/protobuf/io/gzip_stream.cc +++ b/src/google/protobuf/io/gzip_stream.cc @@ -1,5 +1,5 @@ // Protocol Buffers - Google's data interchange format -// Copyright 2009 Google Inc. All rights reserved. +// Copyright 2008 Google Inc. All rights reserved. // http://code.google.com/p/protobuf/ // // Redistribution and use in source and binary forms, with or without @@ -29,8 +29,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Author: brianolson@google.com (Brian Olson) -// Based on original Protocol Buffers design by -// Sanjay Ghemawat, Jeff Dean, and others. // // This file contains the implementation of classes GzipInputStream and // GzipOutputStream. @@ -39,6 +37,7 @@ #if HAVE_ZLIB #include <google/protobuf/io/gzip_stream.h> + #include <google/protobuf/stubs/common.h> namespace google { @@ -291,6 +290,6 @@ bool GzipOutputStream::Close() { } // namespace io } // namespace protobuf -} // namespace google #endif // HAVE_ZLIB +} // namespace google |