Update talk to 58113193 together with https://webrtc-codereview.appspot.com/5309005/.
R=mallinath@webrtc.org, niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5719004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5274 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -94,6 +94,10 @@ uint32 Time() {
|
||||
return static_cast<uint32>(TimeNanos() / kNumNanosecsPerMillisec);
|
||||
}
|
||||
|
||||
uint64 TimeMicros() {
|
||||
return static_cast<uint64>(TimeNanos() / kNumNanosecsPerMicrosec);
|
||||
}
|
||||
|
||||
#if defined(WIN32)
|
||||
static const uint64 kFileTimeToUnixTimeEpochOffset = 116444736000000000ULL;
|
||||
|
||||
|
Reference in New Issue
Block a user