From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Tue, 21 Nov 2017 19:43:08 +0000 (+0000)
Subject: time: fix build on Android
X-Git-Tag: go1.10beta1~180
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=40d8b4b2e2a7a220eac9fef58c79f285ec336d24;p=gostls13.git

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/79136
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/time/zoneinfo_android.go b/src/time/zoneinfo_android.go
index 40c8ae04ea..65e0975ab0 100644
--- a/src/time/zoneinfo_android.go
+++ b/src/time/zoneinfo_android.go
@@ -47,11 +47,11 @@ func androidLoadTzinfoFromTzdata(file, name string) ([]byte, error) {
 	if err := preadn(fd, buf, 0); err != nil {
 		return nil, errors.New("corrupt tzdata file " + file)
 	}
-	d := data{buf, false}
+	d := dataIO{buf, false}
 	if magic := d.read(6); string(magic) != "tzdata" {
 		return nil, errors.New("corrupt tzdata file " + file)
 	}
-	d = data{buf[12:], false}
+	d = dataIO{buf[12:], false}
 	indexOff, _ := d.big4()
 	dataOff, _ := d.big4()
 	indexSize := dataOff - indexOff
@@ -66,7 +66,7 @@ func androidLoadTzinfoFromTzdata(file, name string) ([]byte, error) {
 		if string(entry[:len(name)]) != name {
 			continue
 		}
-		d := data{entry[namesize:], false}
+		d := dataIO{entry[namesize:], false}
 		off, _ := d.big4()
 		size, _ := d.big4()
 		buf := make([]byte, size)