summaryrefslogtreecommitdiff
path: root/libgo/go/compress
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-04 23:15:33 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-04 23:15:33 +0000
commit5892f89fbf9417381ac68163890704fe9e7d11f7 (patch)
tree89766166feb4ceca2d983169c5360e3f6f521b12 /libgo/go/compress
parent40196b7832598b0a0298d7a8bc5b8a4c723c80aa (diff)
downloadgcc-5892f89fbf9417381ac68163890704fe9e7d11f7.tar.gz
libgo: Merge from revision 18783:00cce3a34d7e of master library.
This revision was committed January 7, 2014. The next revision deleted runtime/mfinal.c. That will be done in a subsequent merge. This merge changes type descriptors to add a zero field, pointing to a zero value for that type. This is implemented as a common variable. * go-gcc.cc (Gcc_backend::implicit_variable): Add is_common and alignment parameters. Permit init parameter to be NULL. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211249 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/compress')
-rw-r--r--libgo/go/compress/flate/fixedhuff.go4
-rw-r--r--libgo/go/compress/flate/inflate.go2
2 files changed, 5 insertions, 1 deletions
diff --git a/libgo/go/compress/flate/fixedhuff.go b/libgo/go/compress/flate/fixedhuff.go
index 41a6b25dfdb..9be3d534954 100644
--- a/libgo/go/compress/flate/fixedhuff.go
+++ b/libgo/go/compress/flate/fixedhuff.go
@@ -1,3 +1,7 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
package flate
// autogenerated by gen.go, DO NOT EDIT
diff --git a/libgo/go/compress/flate/inflate.go b/libgo/go/compress/flate/inflate.go
index 3eb3b2b83e6..bbe4c5a16fb 100644
--- a/libgo/go/compress/flate/inflate.go
+++ b/libgo/go/compress/flate/inflate.go
@@ -180,7 +180,7 @@ func (h *huffmanDecoder) init(bits []int) bool {
// the NewReader will introduce its own buffering.
type Reader interface {
io.Reader
- ReadByte() (c byte, err error)
+ io.ByteReader
}
// Decompress state.