aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Tao <nigeltao@golang.org>2010-08-10 15:53:19 +1000
committerNigel Tao <nigeltao@golang.org>2010-08-10 15:53:19 +1000
commit96d7c8d4a85e7c5bb317b6c737d5b2dbf0e69c25 (patch)
tree25948ed41e2177c4186e4f63c223e5f6233dd524
parent90a6c91890978de61305801582590a5e43886661 (diff)
downloadgo-96d7c8d4a85e7c5bb317b6c737d5b2dbf0e69c25.tar.gz
go-96d7c8d4a85e7c5bb317b6c737d5b2dbf0e69c25.zip
exp/draw/x11: temporarily workaround compiler bug 1011.
R=r CC=golang-dev https://golang.org/cl/1951041
-rw-r--r--src/pkg/exp/draw/x11/auth.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pkg/exp/draw/x11/auth.go b/src/pkg/exp/draw/x11/auth.go
index 896dedf05c..b4c75a360d 100644
--- a/src/pkg/exp/draw/x11/auth.go
+++ b/src/pkg/exp/draw/x11/auth.go
@@ -16,7 +16,10 @@ func readU16BE(r io.Reader, b []byte) (uint16, os.Error) {
if err != nil {
return 0, err
}
- return uint16(b[0])<<8 + uint16(b[1]), nil
+ // TODO(nigeltao): remove the workaround when bug 1011 gets fixed.
+ //return uint16(b[0])<<8 + uint16(b[1]), nil
+ ret := uint16(b[0])<<8 + uint16(b[1])
+ return ret, nil
}
// readStr reads a length-prefixed string from r, using b as a scratch buffer.