authorgravatar for leroycepearson@geemili.xyzLeRoyce Pearson <leroycepearson@geemili.xyz> 2020-05-01 09:08:32-06:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-24 21:40:08-04:00
logb85a191398b45eb4d8d2be7f1eaa1d871459a7db
tree7f724c4a67c053d650c3394a7926b7a52ad2fd12
parent2dfe798217c6348f4fc18b5fa9d86d9db06146b1

Fix compile errors for MacOS


1 files changed, 3 insertions(+), 4 deletions(-)

lib/std/time.zig+3-4
......@@ -74,10 +74,9 @@ pub fn _init_timestart() void {
7474 var micro: os.darwin.timeval = undefined;
7575 var timestart: DarwinTimeStart = undefined;
7676
77 var err = os.darwin.mach_timebase_info(&timestart.timebase);
78 assert(err == 0);
77 os.darwin.mach_timebase_info(&timestart.timebase);
7978
80 err = os.darwin.gettimeofday(&micro, null);
79 const err = os.darwin.gettimeofday(&micro, null);
8180 assert(err == 0);
8281
8382 timestart.initclock = os.darwin.mach_absolute_time();
......@@ -119,7 +118,7 @@ pub fn nanoTimestamp() u64 {
119118 _init_timestart_once.call();
120119
121120 const clock: u64 = os.darwin.mach_absolute_time() - _timestart.initclock;
122 const nano = clock * @divFloor(@as(u64, _timestart.timebase.number), @as(u64, _timestart.timebase.denom));
121 const nano = @divFloor(clock * @as(u64, _timestart.timebase.numer), @as(u64, _timestart.timebase.denom));
123122
124123 const tv_sec_nsec = @intCast(u64, _timestart.inittime.tv_sec) * ns_per_s;
125124 const tv_nsec = @intCast(u64, _timestart.inittime.tv_nsec);