69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
|
diff --git a/src/syscall/syscall_darwin_386.go b/src/syscall/syscall_darwin_386.go
|
||
|
|
index 2074e7a..286ca98 100644
|
||
|
|
--- a/src/syscall/syscall_darwin_386.go
|
||
|
|
+++ b/src/syscall/syscall_darwin_386.go
|
||
|
|
@@ -26,14 +26,22 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
|
||
|
|
}
|
||
|
|
|
||
|
|
//sysnb gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
|
||
|
|
-func Gettimeofday(tv *Timeval) (err error) {
|
||
|
|
- // The tv passed to gettimeofday must be non-nil
|
||
|
|
- // but is otherwise unused. The answers come back
|
||
|
|
- // in the two registers.
|
||
|
|
+func Gettimeofday(tv *Timeval) error {
|
||
|
|
+ // The tv passed to gettimeofday must be non-nil.
|
||
|
|
+ // Before macOS Sierra (10.12), tv was otherwise unused and
|
||
|
|
+ // the answers came back in the two registers.
|
||
|
|
+ // As of Sierra, gettimeofday return zeros and populates
|
||
|
|
+ // tv itself.
|
||
|
|
sec, usec, err := gettimeofday(tv)
|
||
|
|
- tv.Sec = int32(sec)
|
||
|
|
- tv.Usec = int32(usec)
|
||
|
|
- return err
|
||
|
|
+ if err != nil {
|
||
|
|
+ return err
|
||
|
|
+ }
|
||
|
|
+ if sec != 0 || usec != 0 {
|
||
|
|
+ tv.Sec = int32(sec)
|
||
|
|
+ tv.Usec = int32(usec)
|
||
|
|
+ }
|
||
|
|
+ return nil
|
||
|
|
+
|
||
|
|
}
|
||
|
|
|
||
|
|
func SetKevent(k *Kevent_t, fd, mode, flags int) {
|
||
|
|
diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
|
||
|
|
index 70b53b8..e2565ba 100644
|
||
|
|
--- a/src/syscall/syscall_darwin_amd64.go
|
||
|
|
+++ b/src/syscall/syscall_darwin_amd64.go
|
||
|
|
@@ -26,14 +26,22 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
|
||
|
|
}
|
||
|
|
|
||
|
|
//sysnb gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
|
||
|
|
-func Gettimeofday(tv *Timeval) (err error) {
|
||
|
|
- // The tv passed to gettimeofday must be non-nil
|
||
|
|
- // but is otherwise unused. The answers come back
|
||
|
|
- // in the two registers.
|
||
|
|
+func Gettimeofday(tv *Timeval) error {
|
||
|
|
+ // The tv passed to gettimeofday must be non-nil.
|
||
|
|
+ // Before macOS Sierra (10.12), tv was otherwise unused and
|
||
|
|
+ // the answers came back in the two registers.
|
||
|
|
+ // As of Sierra, gettimeofday return zeros and populates
|
||
|
|
+ // tv itself.
|
||
|
|
sec, usec, err := gettimeofday(tv)
|
||
|
|
- tv.Sec = sec
|
||
|
|
- tv.Usec = usec
|
||
|
|
- return err
|
||
|
|
+ if err != nil {
|
||
|
|
+ return err
|
||
|
|
+ }
|
||
|
|
+ if sec != 0 || usec != 0 {
|
||
|
|
+ tv.Sec = sec
|
||
|
|
+ tv.Usec = usec
|
||
|
|
+ }
|
||
|
|
+ return nil
|
||
|
|
+
|
||
|
|
}
|
||
|
|
|
||
|
|
func SetKevent(k *Kevent_t, fd, mode, flags int) {
|