Commit 40d8b4b2 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick

time: fix build on Android

Some type renames were missing in the android file from CL 79017

Change-Id: I419215575ca7975241afb8d2069560c8b1d142c6
Reviewed-on: https://go-review.googlesource.com/79136Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent b75b4d0e
...@@ -47,11 +47,11 @@ func androidLoadTzinfoFromTzdata(file, name string) ([]byte, error) { ...@@ -47,11 +47,11 @@ func androidLoadTzinfoFromTzdata(file, name string) ([]byte, error) {
if err := preadn(fd, buf, 0); err != nil { if err := preadn(fd, buf, 0); err != nil {
return nil, errors.New("corrupt tzdata file " + file) return nil, errors.New("corrupt tzdata file " + file)
} }
d := data{buf, false} d := dataIO{buf, false}
if magic := d.read(6); string(magic) != "tzdata" { if magic := d.read(6); string(magic) != "tzdata" {
return nil, errors.New("corrupt tzdata file " + file) return nil, errors.New("corrupt tzdata file " + file)
} }
d = data{buf[12:], false} d = dataIO{buf[12:], false}
indexOff, _ := d.big4() indexOff, _ := d.big4()
dataOff, _ := d.big4() dataOff, _ := d.big4()
indexSize := dataOff - indexOff indexSize := dataOff - indexOff
...@@ -66,7 +66,7 @@ func androidLoadTzinfoFromTzdata(file, name string) ([]byte, error) { ...@@ -66,7 +66,7 @@ func androidLoadTzinfoFromTzdata(file, name string) ([]byte, error) {
if string(entry[:len(name)]) != name { if string(entry[:len(name)]) != name {
continue continue
} }
d := data{entry[namesize:], false} d := dataIO{entry[namesize:], false}
off, _ := d.big4() off, _ := d.big4()
size, _ := d.big4() size, _ := d.big4()
buf := make([]byte, size) buf := make([]byte, size)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment