diff options
| author | bors <bors@rust-lang.org> | 2013-03-14 14:07:01 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-14 14:07:01 -0700 |
| commit | 2293b075b83d78b8139c0767c8034582112737bc (patch) | |
| tree | d3705ff8c521e91642df4accf52d5c1a71350144 | |
| parent | b778ec92823636570836987403c3e012c71d95de (diff) | |
| parent | d8094f8602247927a39d33cbad13bdff3b2d467f (diff) | |
| download | rust-2293b075b83d78b8139c0767c8034582112737bc.tar.gz rust-2293b075b83d78b8139c0767c8034582112737bc.zip | |
auto merge of #5364 : xenocons/rust/patch-1, r=z0w0
| -rw-r--r-- | src/rt/rust_builtin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 5a9de9735ba..ccb2c0c5c1c 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -321,7 +321,7 @@ get_time(int64_t *sec, int32_t *nsec) { ul.HighPart = fileTime.dwHighDateTime; uint64_t ns_since_1601 = ul.QuadPart / 10; - const uint64_t NANOSECONDS_FROM_1601_TO_1970 = 11644473600000000u; + const uint64_t NANOSECONDS_FROM_1601_TO_1970 = 11644473600000000ull; uint64_t ns_since_1970 = ns_since_1601 - NANOSECONDS_FROM_1601_TO_1970; *sec = ns_since_1970 / 1000000; *nsec = (ns_since_1970 % 1000000) * 1000; |